Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Pass all relevant tool variables to postinstall, not just a ...
details: https://anonhg.NetBSD.org/src/rev/28bb1b4a8368
branches: trunk
changeset: 780990:28bb1b4a8368
user: apb <apb%NetBSD.org@localhost>
date: Tue Aug 14 12:37:41 2012 +0000
description:
Pass all relevant tool variables to postinstall, not just a subset.
diffstat:
Makefile | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diffs (39 lines):
diff -r b37ebeadeabd -r 28bb1b4a8368 Makefile
--- a/Makefile Tue Aug 14 12:31:05 2012 +0000
+++ b/Makefile Tue Aug 14 12:37:41 2012 +0000
@@ -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 @@
.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 " ==============================="
Home |
Main Index |
Thread Index |
Old Index