summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2015-05-03 15:13:13 +0000
committermartin <martin@NetBSD.org>2015-05-03 15:13:13 +0000
commit1b08a620298065dbb83eafc65970928b725445e9 (patch)
tree38b98cda008df032e39e2de92462db0d0475f8e7 /Makefile
parent1d148aec8ab040adbd621ebe51c2456d57d9f95b (diff)
PR 49870: pass the xsrc path to postinstall
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 9 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index ad7b7999e17..ee218c87695 100644
--- a/Makefile
+++ b/Makefile
@@ -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 @@ _POSTINSTALL_ENV= \
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 " ==============================="