diff options
| author | rillig <rillig> | 2006-11-12 00:13:26 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2006-11-12 00:13:26 +0000 |
| commit | 544ac8b60bddecd7510f22de27fc940603cd1579 (patch) | |
| tree | fd06c56a0e948a757ea22ef72533a70f87489242 | |
| parent | 738653a5b75990d3b85e346aa2b35cea2dd431ab (diff) | |
| download | pkgsrc-544ac8b60bddecd7510f22de27fc940603cd1579.tar.gz | |
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.
| -rw-r--r-- | mk/check/check-wrkref.mk | 8 | ||||
| -rw-r--r-- | mk/install/install.mk | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/mk/check/check-wrkref.mk b/mk/check/check-wrkref.mk index bb26c30f23a..3249f6779e6 100644 --- a/mk/check/check-wrkref.mk +++ b/mk/check/check-wrkref.mk @@ -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 @@ PKG_FAIL_REASON+= "[check-wrkref.mk] CHECK_WRKREF must be one of { no tools work .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 --git a/mk/install/install.mk b/mk/install/install.mk index 57befdf8880..59659994e54 100644 --- a/mk/install/install.mk +++ b/mk/install/install.mk @@ -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 @@ _INSTALL_ALL_TARGETS+= release-install-localbase-lock .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 |