summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorapb <apb@NetBSD.org>2012-08-14 12:37:41 +0000
committerapb <apb@NetBSD.org>2012-08-14 12:37:41 +0000
commit5e8d19522d6ff163908a570efcc67aa35dd04525 (patch)
tree815f54e7e55c4f2f5ffbff7f7242521030f15588 /Makefile
parent91915d035a7587f3f2df62b5bf02cb375db97c63 (diff)
Pass all relevant tool variables to postinstall, not just a subset.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 10 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 000286aef6b..93f885a9930 100644
--- a/Makefile
+++ b/Makefile
@@ -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 " ==============================="