Module Name: src
Committed By: riz
Date: Mon May 4 20:24:42 UTC 2015
Modified Files:
src [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by martin in ticket #733):
Makefile: revision 1.313
PR 49870: pass the xsrc path to postinstall
To generate a diff of this commit:
cvs rdiff -u -r1.309.2.1 -r1.309.2.2 src/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.309.2.1 src/Makefile:1.309.2.2
--- src/Makefile:1.309.2.1 Fri Nov 14 14:58:27 2014
+++ src/Makefile Mon May 4 20:24:42 2015
@@ -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 @@ _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 " ==============================="
