diff options
| author | rillig <rillig> | 2006-11-11 23:31:38 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2006-11-11 23:31:38 +0000 |
| commit | 90fa70298297da257f0835748e30cd8b965e1d52 (patch) | |
| tree | 41f3bdee166da846d8b245f12c8491d5d6e53af1 | |
| parent | 44b4daf8ae4f9522fdd0773c0fe1181d2afe9f5a (diff) | |
| download | pkgsrc-90fa70298297da257f0835748e30cd8b965e1d52.tar.gz | |
Moved the check whether check-shlibs should be run from
install/install.mk to check/check-shlibs.mk.
Renamed check-shlibs to _check-shlibs. Since it had been declared as
"private" before, this will not break anything.
| -rw-r--r-- | mk/check/check-shlibs.mk | 9 | ||||
| -rw-r--r-- | mk/install/install.mk | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/mk/check/check-shlibs.mk b/mk/check/check-shlibs.mk index 5f79ca67022..5e36fe46f31 100644 --- a/mk/check/check-shlibs.mk +++ b/mk/check/check-shlibs.mk @@ -1,4 +1,4 @@ -# $NetBSD: check-shlibs.mk,v 1.6 2006/11/11 23:27:51 rillig Exp $ +# $NetBSD: check-shlibs.mk,v 1.7 2006/11/11 23:31:38 rillig Exp $ # # This file verifies that all libraries used by the package can be found # at run-time. @@ -29,7 +29,12 @@ _CHECK_SHLIBS_ERE= /(bin/|sbin/|libexec/|lib/lib.*\.so|lib/lib.*\.dylib) _CHECK_SHLIBS_FILELIST_CMD?= ${SED} -e '/^@/d' ${PLIST} -check-shlibs: error-check .PHONY +.if !empty(CHECK_SHLIBS:M[Yy][Ee][Ss]) && \ + !empty(CHECK_SHLIBS_SUPPORTED:M[Yy][Ee][Ss]) +privileged-install-hook: _check-shlibs +.endif + +_check-shlibs: error-check .PHONY @${STEP_MSG} "Checking for missing run-time search paths 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 5dad61bca5f..2d600862f57 100644 --- a/mk/install/install.mk +++ b/mk/install/install.mk @@ -1,4 +1,4 @@ -# $NetBSD: install.mk,v 1.27 2006/11/07 18:16:19 joerg Exp $ +# $NetBSD: install.mk,v 1.28 2006/11/11 23:31:38 rillig Exp $ ###################################################################### ### install (PUBLIC) @@ -160,9 +160,6 @@ _INSTALL_ALL_TARGETS+= release-install-localbase-lock .endif _INSTALL_ALL_TARGETS+= error-check -.if empty(CHECK_SHLIBS:M[nN][oO]) -privileged-install-hook: check-shlibs -.endif .if empty(CHECK_WRKREF:M[nN][oO]) privileged-install-hook: check-wrkref .endif |