diff options
| author | rillig <rillig@pkgsrc.org> | 2007-01-06 20:15:26 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-01-06 20:15:26 +0000 |
| commit | 06e2f03ee13b8f112ad3eff131815f0789d35a70 (patch) | |
| tree | 2e2ab81f8b1c42d79407d7725fde2e925dd777d6 | |
| parent | 75dc5622b35caddd9f8558d2c0e265d03de40598 (diff) | |
| download | pkgsrc-06e2f03ee13b8f112ad3eff131815f0789d35a70.tar.gz | |
Moved the code that installs check-files on the hook from install.mk to
check-files.mk, for two reasons:
1. It belongs there.
2. Now check-files is run before check-perms and check-interpreter.
| -rw-r--r-- | mk/check/check-files.mk | 6 | ||||
| -rw-r--r-- | mk/install/install.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mk/check/check-files.mk b/mk/check/check-files.mk index a3c42c57d50..6dba9658cc9 100644 --- a/mk/check/check-files.mk +++ b/mk/check/check-files.mk @@ -1,4 +1,4 @@ -# $NetBSD: check-files.mk,v 1.12 2006/12/15 13:15:06 martti Exp $ +# $NetBSD: check-files.mk,v 1.13 2007/01/06 20:15:26 rillig Exp $ # # This file checks that the list of installed files matches the PLIST. # For that purpose it records the file list of LOCALBASE before and @@ -144,6 +144,10 @@ _CHECK_FILES_POST+= ${_CHECK_FILES_POST.sysconfdir} _CHECK_FILES_POST+= ${_CHECK_FILES_POST.varbase} .endif +.if empty(CHECK_FILES:M[nN][oO]) +privileged-install-hook: check-files +.endif + ########################################################################### # check-files-pre and check-files-post targets and subtargets # diff --git a/mk/install/install.mk b/mk/install/install.mk index 9001c063a9f..4a6d80bbab2 100644 --- a/mk/install/install.mk +++ b/mk/install/install.mk @@ -1,4 +1,4 @@ -# $NetBSD: install.mk,v 1.31 2006/11/12 00:51:00 rillig Exp $ +# $NetBSD: install.mk,v 1.32 2007/01/06 20:15:26 rillig Exp $ # # This file provides the code for the "install" phase. # @@ -173,10 +173,6 @@ _INSTALL_ALL_TARGETS+= release-install-localbase-lock .endif _INSTALL_ALL_TARGETS+= error-check -.if empty(CHECK_FILES:M[nN][oO]) -privileged-install-hook: check-files -.endif - .PHONY: install-all su-install-all . if !empty(_MAKE_INSTALL_AS_ROOT:M[Yy][Ee][Ss]) install-all: su-target |