diff options
| author | hubertf <hubertf> | 2001-03-07 00:26:26 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 2001-03-07 00:26:26 +0000 |
| commit | 23e9b72af2bfa762f31ee01f6d3873b9094d5779 (patch) | |
| tree | a2a9ac7f17591aaa4f1e30aa0351017cfc0ce3a7 /mk | |
| parent | 9f2e68438a044de7b2693f4eba994e7799f03678 (diff) | |
| download | pkgsrc-23e9b72af2bfa762f31ee01f6d3873b9094d5779.tar.gz | |
check-shlibs: don't complain about uninstalled pkg on pkgs that have
NO_PKG_REGISTER set (like pkg_install)
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index c97b102c660..3820f01d7de 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.677 2001/03/06 16:00:15 wiz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.678 2001/03/07 00:26:26 hubertf Exp $ # # This file is in the public domain. # @@ -1589,7 +1589,7 @@ do-package: ${PLIST} ${DESCR} exit 1; \ fi; \ fi; \ - if ${PKG_CREATE} ${PKG_ARGS_BINPKG} ${PKGFILE}; then \ + if ${PKG_CREATE} ${PKG_ARGS_BINPKG} ${PKGFILE}; then \ ${MAKE} ${MAKEFLAGS} package-links; \ else \ ${MAKE} ${MAKEFLAGS} delete-package; \ @@ -1901,6 +1901,7 @@ do-shlib-handling: # ${PLIST} exists. # check-shlibs: +.if !defined(NO_PKG_REGISTER) ${_PKG_SILENT}${_PKG_DEBUG}\ bins=`${PKG_INFO} -qL ${PKGNAME} | ( ${EGREP} -h '/(bin|sbin|libexec)/' || ${TRUE} )`; \ if [ "${OBJECT_FMT}" = "ELF" ]; then \ @@ -1929,6 +1930,7 @@ check-shlibs: ${SHCOMMENT} Might not error-out for non-pkg-developers; \ exit 1 ; \ fi +.endif # NO_PKG_REGISTER .if !target(show-shlib-type) |