pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

plan9port: More gracefully handle build/install environment



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Wed Jul 8 16:48:09 2020 +0200
Changeset:	cc83d1b98e23db52786becfb956d4617e93c20c1

Modified Files:
	plan9port/Makefile

Log Message:
plan9port: More gracefully handle build/install environment

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cc83d1b98e23db52786becfb956d4617e93c20c1

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

diffstat:
 plan9port/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diffs:
diff --git a/plan9port/Makefile b/plan9port/Makefile
index cfc733a25b..e6e3546b3e 100644
--- a/plan9port/Makefile
+++ b/plan9port/Makefile
@@ -49,6 +49,8 @@ REPLACE_FILES.rc+=	src/cmd/upas/misc/remotemail
 REPLACE_FILES.rc+=	src/cmd/venti/srv/conf.rc
 REPLACE_FILES.rc+=	src/cmd/venti/srv/tester
 
+INSTALL_ENV+=	PLAN9_TARGET=${PREFIX}/plan9 
+
 pre-build:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/plan9
 	${MV} ${WRKSRC}/* ${DESTDIR}${PREFIX}/plan9
@@ -60,7 +62,7 @@ do-configure:
 
 do-build:
 	${RUN} cd ${DESTDIR}${PREFIX}/plan9 && \
-	    ./INSTALL -b
+	    ${PKGSRC_SETENV} ${MAKE_ENV} ./INSTALL -b
 
 post-build:
 	${RUN} ${FIND} ${DESTDIR}${PREFIX}/plan9 -type f -name '*.orig' | \
@@ -68,7 +70,7 @@ post-build:
 
 do-install:
 	${RUN} cd ${DESTDIR}${PREFIX}/plan9 && \
-	    PLAN9_TARGET=${PREFIX}/plan9 ./INSTALL -c
+	    ${PKGSRC_SETENV} ${INSTALL_ENV} ${MAKE_ENV} ./INSTALL -c
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 PTHREAD_AUTO_VARS=	yes


Home | Main Index | Thread Index | Old Index