Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src PR 49870: pass the xsrc path to postinstall



details:   https://anonhg.NetBSD.org/src/rev/89e38372fe8c
branches:  trunk
changeset: 808062:89e38372fe8c
user:      martin <martin%NetBSD.org@localhost>
date:      Sun May 03 15:13:13 2015 +0000

description:
PR 49870: pass the xsrc path to postinstall

diffstat:

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

diffs (42 lines):

diff -r 0f2c3a62f10f -r 89e38372fe8c Makefile
--- a/Makefile  Sun May 03 15:07:12 2015 +0000
+++ b/Makefile  Sun May 03 15:13:13 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.312 2015/01/07 20:42:01 joerg Exp $
+#      $NetBSD: Makefile,v 1.313 2015/05/03 15:13:13 martin 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 "   ==============================="
 
 



Home | Main Index | Thread Index | Old Index