diff options
| author | jlam <jlam> | 2003-09-05 11:34:25 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-09-05 11:34:25 +0000 |
| commit | 1beb4c6ade2ac73cf310c419ffea756f6ea1541a (patch) | |
| tree | 44709d065bffeb4880702cf53263d326c5eb8ddf /mk/bsd.pkg.mk | |
| parent | f338272eb1030f03df6d8758e828df1457bf440d (diff) | |
| download | pkgsrc-1beb4c6ade2ac73cf310c419ffea756f6ea1541a.tar.gz | |
Package Makefiles should refer to PKG_SYSCONFBASEDIR instead of
PKG_SYSCONFBASE when they want PKG_SYSCONFDIR stripped of
PKG_SYSCONFSUBDIR. This makes PKG_SYSCONFBASE=/etc work with pkgviews by
installing all config files into /etc/packages/<pkg> instead of
occasionally putting some directly into /etc.
Also only create PKG_SYSCONFDIR if we're actually going to copy config
files.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index b58ece4e17b..765aa2478d7 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1259 2003/09/05 09:44:34 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1260 2003/09/05 11:34:26 jlam Exp $ # # This file is in the public domain. # @@ -1244,6 +1244,7 @@ PKG_SYSCONFVAR?= ${PKGBASE} PKG_SYSCONFBASE?= ${PREFIX}/etc .if defined(PKG_SYSCONFDIR.${PKG_SYSCONFVAR}) PKG_SYSCONFDIR= ${PKG_SYSCONFDIR.${PKG_SYSCONFVAR}} +PKG_SYSCONFBASEDIR= ${PKG_SYSCONFDIR.${PKG_SYSCONFVAR}} PKG_SYSCONFDEPOTBASE= # empty PKG_SYSCONFVIEWBASE= # empty .else @@ -1251,22 +1252,22 @@ PKG_SYSCONFSUBDIR?= # empty . if ${PKG_INSTALLATION_TYPE} == "overwrite" PKG_SYSCONFDEPOTBASE= # empty PKG_SYSCONFVIEWBASE= # empty -_PKG_SYSCONFBASE= ${PKG_SYSCONFBASE} +PKG_SYSCONFBASEDIR= ${PKG_SYSCONFBASE} . else PKG_SYSCONFVIEWBASE= ${PKG_SYSCONFBASE} . if !empty(PKG_SYSCONFBASE:M${PREFIX}) || \ !empty(PKG_SYSCONFBASE:M${PREFIX}/*) PKG_SYSCONFDEPOTBASE= # empty -_PKG_SYSCONFBASE= ${PKG_SYSCONFBASE} +PKG_SYSCONFBASEDIR= ${PKG_SYSCONFBASE} . else PKG_SYSCONFDEPOTBASE= ${PKG_SYSCONFBASE}/${DEPOT_SUBDIR} -_PKG_SYSCONFBASE= ${PKG_SYSCONFDEPOTBASE}/${PKGNAME} +PKG_SYSCONFBASEDIR= ${PKG_SYSCONFDEPOTBASE}/${PKGNAME} . endif . endif . if empty(PKG_SYSCONFSUBDIR) -PKG_SYSCONFDIR= ${_PKG_SYSCONFBASE} +PKG_SYSCONFDIR= ${PKG_SYSCONFBASEDIR} . else -PKG_SYSCONFDIR= ${_PKG_SYSCONFBASE}/${PKG_SYSCONFSUBDIR} +PKG_SYSCONFDIR= ${PKG_SYSCONFBASEDIR}/${PKG_SYSCONFSUBDIR} . endif .endif |