diff options
| author | jlam <jlam> | 2004-03-29 06:49:04 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-03-29 06:49:04 +0000 |
| commit | d2d1cb2025f089f6d27aaa79759d0658304de002 (patch) | |
| tree | bafe1f023be091c9bb4cdcc630e6229a7f021651 | |
| parent | 2e8df9a42fc6901a495dcdadccf9310835156640 (diff) | |
| download | pkgsrc-d2d1cb2025f089f6d27aaa79759d0658304de002.tar.gz | |
Set DFLT_PKG_SYSCONDIR to the location that PKG_SYSCONFDIR would have
been set to if it hadn't been overridden by PKG_SYSCONFDIR.<pkg>. This
can be used in /etc/mk.conf to re-override certain PKG_SYSCONFDIR.<pkg>
in /etc/mk.conf from various package Makefiles, e.g.
PKG_SYSCONFDIR.openssl= ${DFLT_PKG_SYSCONFDIR}
PKG_SYSCONFDIR.tcp_wrappers= ${DFLT_PKG_SYSCONFDIR}
| -rw-r--r-- | mk/bsd.pkg.mk | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index b18b1f6a7a2..e8290e7345a 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1427 2004/03/27 08:06:24 grant Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1428 2004/03/29 06:49:04 jlam Exp $ # # This file is in the public domain. # @@ -1331,34 +1331,34 @@ CONFIG_STATUS_OVERRIDE?= \ # Config file related settings - see Packages.txt # PKG_SYSCONFVAR?= ${PKGBASE} -.if defined(PKG_SYSCONFDIR.${PKG_SYSCONFVAR}) -PKG_SYSCONFDIR= ${PKG_SYSCONFDIR.${PKG_SYSCONFVAR}} -PKG_SYSCONFBASEDIR= ${PKG_SYSCONFDIR.${PKG_SYSCONFVAR}} -PKG_SYSCONFDEPOTBASE= # empty -.else PKG_SYSCONFSUBDIR?= # empty -. if ${PKG_INSTALLATION_TYPE} == "overwrite" +.if ${PKG_INSTALLATION_TYPE} == "overwrite" PKG_SYSCONFDEPOTBASE= # empty PKG_SYSCONFBASEDIR= ${PKG_SYSCONFBASE} -. else -. if !empty(PKG_SYSCONFBASE:M${PREFIX}) || \ - !empty(PKG_SYSCONFBASE:M${PREFIX}/*) +.else +. if !empty(PKG_SYSCONFBASE:M${PREFIX}) || \ + !empty(PKG_SYSCONFBASE:M${PREFIX}/*) PKG_SYSCONFDEPOTBASE= # empty PKG_SYSCONFBASEDIR= ${PKG_SYSCONFBASE} -. if !empty(CONF_DEPENDS) -_PLIST_IGNORE_FILES+= ${PKG_SYSCONFDIR:S,^${PREFIX}/,,} -. endif -. else -PKG_SYSCONFDEPOTBASE= ${PKG_SYSCONFBASE}/${DEPOT_SUBDIR} -PKG_SYSCONFBASEDIR= ${PKG_SYSCONFDEPOTBASE}/${PKGNAME} +. if !empty(CONF_DEPENDS) +_PLIST_IGNORE_FILES+= ${PKG_SYSCONFDIR:S,^${PREFIX}/,,} . endif -. endif -. if empty(PKG_SYSCONFSUBDIR) -PKG_SYSCONFDIR= ${PKG_SYSCONFBASEDIR} . else -PKG_SYSCONFDIR= ${PKG_SYSCONFBASEDIR}/${PKG_SYSCONFSUBDIR} +PKG_SYSCONFDEPOTBASE= ${PKG_SYSCONFBASE}/${DEPOT_SUBDIR} +PKG_SYSCONFBASEDIR= ${PKG_SYSCONFDEPOTBASE}/${PKGNAME} . endif .endif +.if empty(PKG_SYSCONFSUBDIR) +DFLT_PKG_SYSCONFDIR:= ${PKG_SYSCONFBASEDIR} +.else +DFLT_PKG_SYSCONFDIR:= ${PKG_SYSCONFBASEDIR}/${PKG_SYSCONFSUBDIR} +.endif +PKG_SYSCONFDIR= ${DFLT_PKG_SYSCONFDIR} +.if defined(PKG_SYSCONFDIR.${PKG_SYSCONFVAR}) +PKG_SYSCONFDIR= ${PKG_SYSCONFDIR.${PKG_SYSCONFVAR}} +PKG_SYSCONFBASEDIR= ${PKG_SYSCONFDIR.${PKG_SYSCONFVAR}} +PKG_SYSCONFDEPOTBASE= # empty +.endif CONFIGURE_ENV+= PKG_SYSCONFDIR="${PKG_SYSCONFDIR}" MAKE_ENV+= PKG_SYSCONFDIR="${PKG_SYSCONFDIR}" |