diff options
| author | jlam <jlam@pkgsrc.org> | 2005-12-29 06:18:53 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-12-29 06:18:53 +0000 |
| commit | 4ab7433a2c2c8636b92563136007796500cc4d1b (patch) | |
| tree | 1778c44e8839c6c7cc01d6ffb42a16395924deda /mk/bsd.pkg.mk | |
| parent | f0aa85ac53670635c71ed535af5b801c6385608f (diff) | |
| download | pkgsrc-4ab7433a2c2c8636b92563136007796500cc4d1b.tar.gz | |
Teach the pkgsrc infrastructure to Just Know when the pkginstall
framework should be used. This is implemented by creating a small
file mk/install/pkginstall.mk that guards the implementation makefile
mk/install/bsd.pkginstall.mk. This guard file just checks whether
one of the pkginstall-related variables is non-empty, and if so, then
the implementation file is automatically included. This completely
deprecates USE_PKGINSTALL, which no longer has any affect in pkgsrc.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index a6eb5861470..49114342153 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1774 2005/12/05 22:07:07 rillig Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1775 2005/12/29 06:18:53 jlam Exp $ # # This file is in the public domain. # @@ -505,18 +505,7 @@ PLIST_SUBST+= OPSYS=${OPSYS:Q} \ # .include "../../mk/alternatives.mk" -# CONF_DEPENDS notes a dependency where the config directory for the -# package matches the dependency's config directory. CONF_DEPENDS is -# only meaningful if ${PKG_INSTALLATION_TYPE} == "pkgviews". -# -CONF_DEPENDS?= # empty -.if !empty(CONF_DEPENDS) -USE_PKGINSTALL= yes -.endif - -.if defined(USE_PKGINSTALL) && !empty(USE_PKGINSTALL:M[yY][eE][sS]) -. include "../../mk/install/bsd.pkginstall.mk" -.endif +.include "../../mk/install/pkginstall.mk" # Set INSTALL_FILE to be the name of any INSTALL file .if !defined(INSTALL_FILE) && exists(${PKGDIR}/INSTALL) |