diff options
| author | hubertf <hubertf@pkgsrc.org> | 2000-11-27 22:24:49 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2000-11-27 22:24:49 +0000 |
| commit | 6ef7e0ffd652594de19b74040d6f93ebf8f56ba1 (patch) | |
| tree | ecc04b9964f861848920c9d54ff3e10bca08a5be | |
| parent | 1733af842f4434beefc47fdb309a287c9b78e776 (diff) | |
| download | pkgsrc-6ef7e0ffd652594de19b74040d6f93ebf8f56ba1.tar.gz | |
* Make sure PKGPATH gets added to BUILD_DEFS (I thought it was there for a
long time. Oh well.)
* Only replace the value of PATH for "PATH", not any variable whose name
starts with PATH (like PKGPATH :-)
Hinted by Jason R. Mastaler <jason@mastaler.com> on tech-pkg.
| -rw-r--r-- | mk/bsd.pkg.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 841b6798411..02613a3406c 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.619 2000/11/27 15:57:43 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.620 2000/11/27 22:24:49 hubertf Exp $ # # This file is in the public domain. # @@ -1112,6 +1112,7 @@ install-depends check-depends: .endif # !NO_IGNORE # Add these defs to the ones dumped into +BUILD_DEFS +BUILD_DEFS+= PKGPATH BUILD_DEFS+= OPSYS OS_VERSION MACHINE_ARCH MACHINE_GNU_ARCH BUILD_DEFS+= CPPFLAGS CFLAGS LDFLAGS BUILD_DEFS+= CONFIGURE_ENV CONFIGURE_ARGS @@ -3110,7 +3111,7 @@ fake-pkg: ${PLIST} ${DESCR} fi; \ ${GREP} '\$$NetBSD' $$files | ${SED} -e 's|^${PKGSRCDIR}/||' > ${BUILD_VERSION_FILE}; .for def in ${BUILD_DEFS} - @${ECHO} ${def}= ${${def}:Q} | ${SED} -e 's|PATH=[^ ]*|PATH=...|' >> ${BUILD_INFO_FILE} + @${ECHO} ${def}= ${${def}:Q} | ${SED} -e 's|^PATH=[^ ]*|^PATH=...|' >> ${BUILD_INFO_FILE} .endfor @${ECHO} "CC= ${CC}-`${CC} --version`" >> ${BUILD_INFO_FILE} .ifdef USE_PERL5 |