Module Name: src
Committed By: apb
Date: Tue Aug 14 12:37:41 UTC 2012
Modified Files:
src: Makefile
Log Message:
Pass all relevant tool variables to postinstall, not just a subset.
To generate a diff of this commit:
cvs rdiff -u -r1.294 -r1.295 src/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.294 src/Makefile:1.295
--- src/Makefile:1.294 Tue Aug 14 12:19:16 2012
+++ src/Makefile Tue Aug 14 12:37:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.294 2012/08/14 12:19:16 apb Exp $
+# $NetBSD: Makefile,v 1.295 2012/08/14 12:37:41 apb Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -188,20 +188,26 @@ afterinstall: .PHONY .MAKE
.endif
_POSTINSTALL= ${.CURDIR}/usr.sbin/postinstall/postinstall
+_POSTINSTALL_ENV= \
+ AWK=${TOOL_AWK:Q} \
+ DB=${TOOL_DB:Q} \
+ GREP=${TOOL_GREP:Q} \
+ MAKE=${MAKE:Q} \
+ PWD_MKDB=${TOOL_PWD_MKDB:Q}
postinstall-check: .PHONY
@echo " === Post installation checks ==="
- AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi
+ ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi
@echo " ================================"
postinstall-fix: .NOTMAIN .PHONY
@echo " === Post installation fixes ==="
- AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix
+ ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix
@echo " ==============================="
postinstall-fix-obsolete: .NOTMAIN .PHONY
@echo " === Removing obsolete files ==="
- AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete
+ ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete
@echo " ==============================="
