diff options
| -rw-r--r-- | Packages.txt | 23 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
2 files changed, 16 insertions, 13 deletions
diff --git a/Packages.txt b/Packages.txt index 0ad4f0ce711..b4cf2e76878 100644 --- a/Packages.txt +++ b/Packages.txt @@ -1,4 +1,4 @@ -# $NetBSD: Packages.txt,v 1.260 2002/08/12 14:23:47 agc Exp $ +# $NetBSD: Packages.txt,v 1.261 2002/08/26 05:17:39 jlam Exp $ ########################################################################### ========================== @@ -1158,15 +1158,18 @@ other make variables: * PKG_SYSCONFSUBDIR is the subdirectory of PKG_SYSCONFBASE under which the configuration files for a particular package may be found, e.g. the Apache configuration files may all be found under the "httpd" subdirectory - of ${PKG_SYSCONFBASE}. - -* PKG_SYSCONFDIR.${PKGBASE} overrides the value of ${PKG_SYSCONFDIR} for a - particular package. This is not meant to be set by a package Makefile, but - is reserved for users who wish to override the PKG_SYSCONFDIR setting for - a particular package with a special location. - -Users will typically want to set PKG_SYSCONFBASE to /etc, or to accept the -default location of ${PREFIX}/etc. + of ${PKG_SYSCONFBASE}. This is meant to be set in a package Makefile. + +* By default PKG_SYSCONFDIR=${PKG_SYSCONFBASE}/${PKG_SYSCONFSUBDIR}, but + the default may be overridden by setting PKG_SYSCONFDIR.${PKG_SYSCONFVAR} + for a particular package, where PKG_SYSCONFVAR defaults to ${PKGBASE}. + This is not meant to be set by a package Makefile, but is reserved for + users who wish to override the PKG_SYSCONFDIR setting for a particular + package with a special location. + +The only variables that users should customize are PKG_SYSCONFBASE and +PKG_SYSCONFDIR.${PKG_SYSCONFVAR}. Users will typically want to set +PKG_SYSCONFBASE to /etc, or to accept the default location of ${PREFIX}/etc. 6.6 Feedback to the author diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 6ac360cfd5d..4c59eac9652 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1034 2002/08/25 18:52:05 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1035 2002/08/26 05:17:40 jlam Exp $ # # This file is in the public domain. # @@ -1056,9 +1056,9 @@ PKG_SYSCONFDIR= ${PKG_SYSCONFDIR.${PKG_SYSCONFVAR}} PKG_SYSCONFSUBDIR?= # empty PKG_SYSCONFBASE?= ${PREFIX}/etc . if empty(PKG_SYSCONFSUBDIR) -PKG_SYSCONFDIR?= ${PKG_SYSCONFBASE} +PKG_SYSCONFDIR= ${PKG_SYSCONFBASE} . else -PKG_SYSCONFDIR?= ${PKG_SYSCONFBASE}/${PKG_SYSCONFSUBDIR} +PKG_SYSCONFDIR= ${PKG_SYSCONFBASE}/${PKG_SYSCONFSUBDIR} . endif .endif |