Fixed template location

2 files changed, 35 insertions, 32 deletions

diff --git a/sysutils/facette/Makefile b/sysutils/facette/Makefile
index 3c6b8bc8b63..e85bff38e4c 100644
--- a/sysutils/facette/Makefile
+++ b/sysutils/facette/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2016/03/08 19:09:56 imil Exp $
+# $NetBSD: Makefile,v 1.3 2016/03/08 20:21:50 imil Exp $
 
 DISTNAME=	facette-0.4.0dev
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=facette/}
 GITHUB_PROJECT=	facette
@@ -27,7 +27,8 @@ SUBST_SED.paths=	-e 's,/usr/local,${PREFIX}/,g'
 DOCDIR=			${PREFIX}/share/doc/facette
 EGDIR=			${PREFIX}/share/examples/facette
 DATADIR=		${PREFIX}/share/facette
-INSTALLATION_DIRS+=	bin ${EGDIR} ${DOCDIR} ${DATADIR}/static
+INSTALLATION_DIRS+=	bin ${EGDIR} ${DOCDIR}
+INSTALLATION_DIRS+=	${DATADIR}/template ${DATADIR}/static
 
 CGO_LDFLAGS=		-L${PREFIX}/lib ${COMPILER_RPATH_FLAG},${PREFIX}/lib
 
@@ -41,8 +42,10 @@ do-install:
 		${DESTDIR}${PREFIX}/bin/
 	cd ${WRKSRC}/docs/man && ${PAX} -rw * ${DESTDIR}${DOCDIR}
 	cd ${WRKSRC}/docs/examples && ${PAX} -rw * ${DESTDIR}${EGDIR}
-	cd ${WRKSRC}/build/*/template && ${PAX} -rw * ${DESTDIR}${DATADIR}
-	cd ${WRKSRC}/build/*/static && ${PAX} -rw * ${DESTDIR}${DATADIR}/static
+	cd ${WRKSRC}/build/*/template &&	\
+		${PAX} -rw * ${DESTDIR}${DATADIR}/template
+	cd ${WRKSRC}/build/*/static &&		\
+		${PAX} -rw * ${DESTDIR}${DATADIR}/static
 
 
 .include "../../databases/rrdtool/buildlink3.mk"
diff --git a/sysutils/facette/PLIST b/sysutils/facette/PLIST
index 86ca6a6dcb6..5d7fb47369b 100644
--- a/sysutils/facette/PLIST
+++ b/sysutils/facette/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/03/08 16:52:44 imil Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/03/08 20:21:50 imil Exp $
 bin/facette
 bin/facettectl
 share/doc/facette/facette.1.md
@@ -10,32 +10,6 @@ share/examples/facette/providers/collectd.json
 share/examples/facette/providers/graphite.json
 share/examples/facette/providers/influxdb.json
 share/examples/facette/providers/kairosdb.json
-share/facette/admin/catalog_list.html
-share/facette/admin/collection_edit.html
-share/facette/admin/collection_list.html
-share/facette/admin/graph_edit.html
-share/facette/admin/graph_edit_linked.html
-share/facette/admin/graph_list.html
-share/facette/admin/group_edit.html
-share/facette/admin/group_list.html
-share/facette/admin/index.html
-share/facette/admin/layout.html
-share/facette/admin/scale_edit.html
-share/facette/admin/scale_list.html
-share/facette/admin/unit_edit.html
-share/facette/admin/unit_list.html
-share/facette/browse/collection.html
-share/facette/browse/graph.html
-share/facette/browse/index.html
-share/facette/browse/layout.html
-share/facette/browse/search.html
-share/facette/common/element.html
-share/facette/common/graph.html
-share/facette/error.html
-share/facette/layout.html
-share/facette/opensearch.xml
-share/facette/show/graph.html
-share/facette/show/layout.html
 share/facette/static/canvg.js
 share/facette/static/facette.js
 share/facette/static/facette.src.js
@@ -63,3 +37,29 @@ share/facette/static/style.css
 share/facette/static/style.print.css
 share/facette/static/style.print.src.css
 share/facette/static/style.src.css
+share/facette/template/admin/catalog_list.html
+share/facette/template/admin/collection_edit.html
+share/facette/template/admin/collection_list.html
+share/facette/template/admin/graph_edit.html
+share/facette/template/admin/graph_edit_linked.html
+share/facette/template/admin/graph_list.html
+share/facette/template/admin/group_edit.html
+share/facette/template/admin/group_list.html
+share/facette/template/admin/index.html
+share/facette/template/admin/layout.html
+share/facette/template/admin/scale_edit.html
+share/facette/template/admin/scale_list.html
+share/facette/template/admin/unit_edit.html
+share/facette/template/admin/unit_list.html
+share/facette/template/browse/collection.html
+share/facette/template/browse/graph.html
+share/facette/template/browse/index.html
+share/facette/template/browse/layout.html
+share/facette/template/browse/search.html
+share/facette/template/common/element.html
+share/facette/template/common/graph.html
+share/facette/template/error.html
+share/facette/template/layout.html
+share/facette/template/opensearch.xml
+share/facette/template/show/graph.html
+share/facette/template/show/layout.html