[pkgsrc/trunk]: pkgsrc/mk Moved the check whether check-shlibs should be run ...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/428e501505b3
branches:  trunk
changeset: 521424:428e501505b3
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Nov 11 23:31:38 2006 +0000

description:
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.

diffstat:

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

diffs (42 lines):

diff -r 16f571130a8a -r 428e501505b3 mk/check/check-shlibs.mk
--- a/mk/check/check-shlibs.mk  Sat Nov 11 23:27:51 2006 +0000
+++ b/mk/check/check-shlibs.mk  Sat Nov 11 23:31:38 2006 +0000
@@ -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_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 -r 16f571130a8a -r 428e501505b3 mk/install/install.mk
--- a/mk/install/install.mk     Sat Nov 11 23:27:51 2006 +0000
+++ b/mk/install/install.mk     Sat Nov 11 23:31:38 2006 +0000
@@ -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 @@
 .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