diff options
| author | jlam <jlam@pkgsrc.org> | 2003-09-17 02:38:22 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-09-17 02:38:22 +0000 |
| commit | 2843d5f4c896e05a3ebc565e4a32aabe03f46d32 (patch) | |
| tree | 075c2f5dda579f36707f768f171254501ff90c89 /mk/bsd.pkg.install.mk | |
| parent | 62a71a08c428f488452e35563766f9ff15102914 (diff) | |
| download | pkgsrc-2843d5f4c896e05a3ebc565e4a32aabe03f46d32.tar.gz | |
Introduce a new variable "CONF_DEPENDS" for pkgviews: a package's
config directory matches the config directory for the dependency
listed in CONF_DEPENDS. Use symlinks to physically point the
package's config directory to the dependency's config directory, and
handle all of this in the INSTALL/DEINSTALL scripts.
Also make the INSTALL/DEINSTALL scripts a bit smarter about not
copying files and not removing files if the source and destination
file locations point to the same thing.
Diffstat (limited to 'mk/bsd.pkg.install.mk')
| -rw-r--r-- | mk/bsd.pkg.install.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk index db9295ee410..63aba11b8a3 100644 --- a/mk/bsd.pkg.install.mk +++ b/mk/bsd.pkg.install.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.install.mk,v 1.51 2003/09/12 05:15:03 jlam Exp $ +# $NetBSD: bsd.pkg.install.mk,v 1.52 2003/09/17 02:38:22 jlam Exp $ # # This Makefile fragment is included by package Makefiles to use the common # INSTALL/DEINSTALL scripts. To use this Makefile fragment, simply: @@ -62,10 +62,12 @@ INSTALL_SRC?= ${INSTALL_TEMPLATES} FILES_SUBST+= PREFIX=${PREFIX} FILES_SUBST+= LOCALBASE=${LOCALBASE} FILES_SUBST+= X11BASE=${X11BASE} +FILES_SUBST+= DEPOTBASE=${DEPOTBASE} FILES_SUBST+= PKG_SYSCONFBASE=${PKG_SYSCONFBASE} FILES_SUBST+= PKG_SYSCONFDEPOTBASE=${PKG_SYSCONFDEPOTBASE} FILES_SUBST+= PKG_SYSCONFBASEDIR=${PKG_SYSCONFBASEDIR} FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} +FILES_SUBST+= CONF_DEPENDS=${CONF_DEPENDS:C/:.*//:Q} FILES_SUBST+= PKGBASE=${PKGBASE} FILES_SUBST+= PKG_INSTALLATION_TYPE=${PKG_INSTALLATION_TYPE} @@ -251,6 +253,8 @@ FILES_SUBST+= LN=${LN:Q} FILES_SUBST+= MKDIR=${MKDIR:Q} FILES_SUBST+= MV=${MV:Q} FILES_SUBST+= PERL5=${PERL5:Q} +FILES_SUBST+= PKG_ADMIN=${PKG_ADMIN_CMD:Q} +FILES_SUBST+= PKG_INFO=${PKG_INFO_CMD:Q} FILES_SUBST+= RM=${RM:Q} FILES_SUBST+= RMDIR=${RMDIR:Q} FILES_SUBST+= SED=${SED:Q} |