pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Moved the check for whether check-wrkref should be ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8260852c874b
branches:  trunk
changeset: 521429:8260852c874b
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Nov 12 00:13:26 2006 +0000

description:
Moved the check for whether check-wrkref should be run from
install/install.mk to check/check-wrkref.mk.

Renamed the check-wrkref target to _check-wrkref.

diffstat:

 mk/check/check-wrkref.mk |  8 ++++++--
 mk/install/install.mk    |  5 +----
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (41 lines):

diff -r 852a78c42470 -r 8260852c874b mk/check/check-wrkref.mk
--- a/mk/check/check-wrkref.mk  Sun Nov 12 00:09:50 2006 +0000
+++ b/mk/check/check-wrkref.mk  Sun Nov 12 00:13:26 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: check-wrkref.mk,v 1.9 2006/11/12 00:09:50 rillig Exp $
+# $NetBSD: check-wrkref.mk,v 1.10 2006/11/12 00:13:26 rillig Exp $
 #
 # This file checks that the installed files don't contain any strings
 # that point to the directory where the package had been built, to make
@@ -42,7 +42,11 @@
 .endif
 _CHECK_WRKREF_DIR=     ${_CHECK_WRKREF_DIR.${CHECK_WRKREF}}
 
-check-wrkref: error-check .PHONY
+.if empty(CHECK_WRKREF:M[nN][oO])
+privileged-install-hook: _check-wrkref
+.endif
+
+_check-wrkref: error-check .PHONY
        @${STEP_MSG} "Checking for work-directory references in ${PKGNAME}"
        ${RUN} rm -f ${ERROR_DIR}/${.TARGET}
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
diff -r 852a78c42470 -r 8260852c874b mk/install/install.mk
--- a/mk/install/install.mk     Sun Nov 12 00:09:50 2006 +0000
+++ b/mk/install/install.mk     Sun Nov 12 00:13:26 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.29 2006/11/11 23:51:30 rillig Exp $
+# $NetBSD: install.mk,v 1.30 2006/11/12 00:13:26 rillig Exp $
 #
 # This file provides the code for the "install" phase.
 #
@@ -173,9 +173,6 @@
 .endif
 _INSTALL_ALL_TARGETS+=         error-check
 
-.if empty(CHECK_WRKREF:M[nN][oO])
-privileged-install-hook: check-wrkref
-.endif
 .if empty(CHECK_FILES:M[nN][oO])
 privileged-install-hook: check-files
 .endif



Home | Main Index | Thread Index | Old Index