diff options
| author | jlam <jlam@pkgsrc.org> | 2006-03-09 23:31:51 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-03-09 23:31:51 +0000 |
| commit | 11d32442f299d5c706cac7ba23d8dff7f5b456a2 (patch) | |
| tree | 80b8fee3bfa9dfe8581edc5378604482c52e4109 /mk/bsd.pkg.mk | |
| parent | 949723070be696cfb857e220a10ea4c6dffbfd5f (diff) | |
| download | pkgsrc-11d32442f299d5c706cac7ba23d8dff7f5b456a2.tar.gz | |
Make it safe to include bsd.pkginstall.mk directly in bsd.pkg.mk, and
drop pkginstall.mk, which did the same thing. Also, rework some of
the targets so that we avoid needing to inspect *_MEMBERS variables
within make -- we defer the check to the shell code invoked by the
targets.
All changes are internal and don't affect existing packages in a
visible way.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 798faea29aa..139a440a69c 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1803 2006/03/09 15:58:10 rillig Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1804 2006/03/09 23:31:51 jlam Exp $ # # This file is in the public domain. # @@ -420,7 +420,7 @@ SCRIPTS_ENV+= ${INSTALL_MACROS} # .include "../../mk/alternatives.mk" -.include "../../mk/install/pkginstall.mk" +.include "../../mk/install/bsd.pkginstall.mk" # Set INSTALL_FILE to be the name of any INSTALL file .if !defined(INSTALL_FILE) && exists(${PKGDIR}/INSTALL) |