Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/Makefile,v rcsdiff: /ftp/cvs/cvsroot/src/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.291.2.2 retrieving revision 1.292 diff -u -p -r1.291.2.2 -r1.292 --- src/Makefile 2012/08/15 17:36:46 1.291.2.2 +++ src/Makefile 2012/04/21 08:28:00 1.292 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.291.2.2 2012/08/15 17:36:46 sborrill Exp $ +# $NetBSD: Makefile,v 1.292 2012/04/21 08:28:00 veego Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -188,27 +188,20 @@ afterinstall: .PHONY .MAKE .endif _POSTINSTALL= ${.CURDIR}/usr.sbin/postinstall/postinstall -_POSTINSTALL_ENV= \ - AWK=${TOOL_AWK:Q} \ - DB=${TOOL_DB:Q} \ - HOST_SH=${HOST_SH:Q} \ - MAKE=${MAKE:Q} \ - PWD_MKDB=${TOOL_PWD_MKDB:Q} \ - STAT=${TOOL_STAT:Q} postinstall-check: .PHONY @echo " === Post installation checks ===" - ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi + AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi @echo " ================================" postinstall-fix: .NOTMAIN .PHONY @echo " === Post installation fixes ===" - ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix + AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix @echo " ===============================" postinstall-fix-obsolete: .NOTMAIN .PHONY @echo " === Removing obsolete files ===" - ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete + AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete @echo " ==============================="