[src/netbsd-7]: src Pull up following revision(s) (requested by martin in tic...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/442f9b724318
branches:  netbsd-7
changeset: 799277:442f9b724318
user:      riz <riz%NetBSD.org@localhost>
date:      Mon May 04 20:24:42 2015 +0000

description:
Pull up following revision(s) (requested by martin in ticket #733):
        Makefile: revision 1.313
PR 49870: pass the xsrc path to postinstall

diffstat:

 Makefile |  14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diffs (42 lines):

diff -r 77a0ee1c8fb6 -r 442f9b724318 Makefile
--- a/Makefile  Mon May 04 20:22:27 2015 +0000
+++ b/Makefile  Mon May 04 20:24:42 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.309.2.1 2014/11/14 14:58:27 martin Exp $
+#      $NetBSD: Makefile,v 1.309.2.2 2015/05/04 20:24:42 riz Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -181,24 +181,28 @@
        SED=${TOOL_SED:Q}               \
        STAT=${TOOL_STAT:Q}
 
+.if ${MKX11} != "no"
+_POSTINSTALL_X11=-x ${X11SRCDIR:Q}
+.endif
+
 postinstall-check: .PHONY
        @echo "   === Post installation checks ==="
-       ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi
+       ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -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
+       ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix
        @echo "   ==============================="
 
 postinstall-fix-obsolete: .NOTMAIN .PHONY
        @echo "   === Removing obsolete files ==="
-       ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete
+       ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix obsolete
        @echo "   ==============================="
 
 postinstall-fix-obsolete_stand: .NOTMAIN .PHONY
        @echo "   === Removing obsolete files ==="
-       ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete_stand
+       ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix obsolete_stand
        @echo "   ==============================="