CVS commit: pkgsrc/www/grafana

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Aug 27 16:54:11 UTC 2020

Modified Files:
        pkgsrc/www/grafana: Makefile

Log Message:
grafana: Expand install paths.

Should fix problem reported by Marc Baudoin.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/grafana/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/grafana/Makefile
diff -u pkgsrc/www/grafana/Makefile:1.33 pkgsrc/www/grafana/Makefile:1.34
--- pkgsrc/www/grafana/Makefile:1.33    Thu Aug 27 13:11:41 2020
+++ pkgsrc/www/grafana/Makefile Thu Aug 27 16:54:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2020/08/27 13:11:41 tnn Exp $
+# $NetBSD: Makefile,v 1.34 2020/08/27 16:54:11 jperkin Exp $
 
 DISTNAME=      grafana-7.1.5
 CATEGORIES=    www
@@ -76,7 +76,8 @@ do-build:
        cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO} run build.go build
 
 do-install:
-       cd ${WRKSRC} && ${INSTALL_PROGRAM} bin/*/grafana-{cli,server} ${DESTDIR}${PREFIX}/bin/
+       ${INSTALL_PROGRAM} ${WRKSRC}/bin/*/grafana-cli ${DESTDIR}${PREFIX}/bin/
+       ${INSTALL_PROGRAM} ${WRKSRC}/bin/*/grafana-server ${DESTDIR}${PREFIX}/bin/
        cd ${WRKDIR}/linux/${DISTNAME}/public && \
                ${PAX} -rw . ${DESTDIR}${PUBLICDIR}
        cd ${WRKSRC} && ${PAX} -rw conf \