plan9port: minor changes.

[Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Mon Nov 21 16:22:41 2022 +0100
Changeset:	b95216f18755bdd6c0cf4ee5ad80736faf245692

Modified Files:
	plan9port/Makefile

Log Message:
plan9port: minor changes.

Removed unwanted substitution in CFLAGS used for testing.

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

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

diffstat:
 plan9port/Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diffs:
diff --git a/plan9port/Makefile b/plan9port/Makefile
index b42970c09f..c1a6502ce3 100644
--- a/plan9port/Makefile
+++ b/plan9port/Makefile
@@ -57,6 +57,7 @@ REPLACE_FILES.rc+=	src/cmd/venti/srv/tester
 EGDIR=		${PREFIX}/share/examples/profile.d
 CONF_FILES+=	${EGDIR}/plan9.sh \
 		${PKG_SYSCONFDIR}/profile.d/plan9.sh
+DOCDIR=		${PREFIX}/share/doc/plan9
 
 SUBST_CLASSES+=		cc
 SUBST_STAGE.cc=		pre-configure
@@ -86,8 +87,7 @@ INSTALLATION_DIRS+=	share/pixmaps
 
 do-configure:
 	${RUN}${ECHO} "CC9='${CC}'" >> ${WRKSRC}/LOCAL.config
-	${RUN}${ECHO} "CC9FLAGS='${CFLAGS:S,-I${PREFIX}/include,,}'" \
-	  >> ${WRKSRC}/LOCAL.config
+	${RUN}${ECHO} "CC9FLAGS='${CFLAGS}'" >> ${WRKSRC}/LOCAL.config
 	${RUN}${ECHO} "LDFLAGS='${LDFLAGS}'" >> ${WRKSRC}/LOCAL.config
 	${RUN}${ECHO} "FONTSRV=fontsrv"	>> ${WRKSRC}/LOCAL.config
 .if !empty(PKG_OPTIONS:Mx11)
@@ -110,20 +110,20 @@ post-build:
 .endfor
 
 do-install:
-	# Move everything to the PLAN9 target.
+# Move everything to the PLAN9 target.
 	${RUN}cd ${WRKSRC} && ${PAX} -rw -pm . ${PLAN9_BUILD}
-	# Rename hard-coded paths and builds mans.
+# Rename hard-coded paths and builds mans.
 	${RUN}cd ${PLAN9_BUILD} &&			\
-	  ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ./INSTALL -c
+	  ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${SH} ./INSTALL -c
 .for f in CHANGES LICENSE README.md
 	${RUN}cd ${PLAN9_BUILD} &&			\
-	  ${PAX} -rw -pm ${f} ${DESTDIR}${PREFIX}/share/doc/plan9
+	  ${PAX} -rw -pm ${f} ${DESTDIR}${DOCDIR}
 .endfor
 	${INSTALL_SCRIPT} ${PLAN9_BUILD}/plan9.sh	\
 	  ${DESTDIR}${PREFIX}/share/examples/profile.d
-	# Delete installation files and other leftovers.
+# Delete installation files and other leftovers.
 	${RUN}${FIND} ${PLAN9_BUILD} -maxdepth 1 -type f ! -name rcmain -delete
-	# Avoid 'executable bit is set on non-executable file'
+# Avoid 'executable bit is set on non-executable file'
 .for x in bclib mimetype
 	${RUN}${FIND} ${PLAN9_BUILD}/lib 		\
 	  -type f -name ${x} -exec ${CHMOD} -x '{}' \;