Received: by mail.netbsd.org (Postfix, from userid 605) id 9973D84DA9; Thu, 27 Aug 2020 16:54:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2024984D79 for ; Thu, 27 Aug 2020 16:54:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id sG5HArhSUbiI for ; Thu, 27 Aug 2020 16:54:11 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7661484D41 for ; Thu, 27 Aug 2020 16:54:11 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6F478FB26; Thu, 27 Aug 2020 16:54:11 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1598547251197520" MIME-Version: 1.0 Date: Thu, 27 Aug 2020 16:54:11 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/www/grafana To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20200827165411.6F478FB26@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1598547251197520 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1598547251197520 Content-Disposition: inline Content-Length: 892 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 \ --_----------=_1598547251197520--