diff options
| author | jlam <jlam@pkgsrc.org> | 2001-11-28 19:55:31 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-11-28 19:55:31 +0000 |
| commit | 208d40b3a266991e8aba62c378769bfd1af43627 (patch) | |
| tree | a399e67971781f8bdd9f40f917af3be4cdbbcfe3 | |
| parent | 7338303f42d7937a536c7591ee257fdd35d4f2df (diff) | |
| download | pkgsrc-208d40b3a266991e8aba62c378769bfd1af43627.tar.gz | |
Move the PKG_SYSCONFDIR logic below the definition of PKGNAME. PKGNAME is
use to set PKGBASE, which is used in the name of the package-specific
config directory override (PKG_SYSCONFDIR.${PKGBASE}). Prior to this, if
PKGNAME wasn't explicitly set in the package, then the override would not
work.
| -rw-r--r-- | mk/bsd.pkg.mk | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index fe704936207..16396f644cf 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.864 2001/11/28 10:21:46 abs Exp $ +# $NetBSD: bsd.pkg.mk,v 1.865 2001/11/28 19:55:31 jlam Exp $ # # This file is in the public domain. # @@ -51,36 +51,6 @@ SCRIPTDIR?= ${.CURDIR}/scripts FILESDIR?= ${.CURDIR}/files PKGDIR?= ${.CURDIR} -# PKG_SYSCONFDIR is where the configuration files for a package may be found. -# This value may be customized in various ways: -# -# PKG_SYSCONFBASE is the main config directory under which all package -# configuration files are to be found. -# -# PKG_SYSCONFSUBDIR is the subdirectory of PKG_SYSCONFBASE under which the -# configuration files for a particular package may be found. -# -# PKG_SYSCONFDIR.${PKGBASE} overrides the value of ${PKG_SYSCONFDIR} for a -# particular package. -# -# Users will typically want to set PKG_SYSCONFBASE to /etc, or accept the -# default location of ${PREFIX}/etc. -# -.if defined(PKG_SYSCONFDIR.${PKGBASE}) -PKG_SYSCONFDIR= ${PKG_SYSCONFDIR.${PKGBASE}} -.else -PKG_SYSCONFSUBDIR?= # empty -PKG_SYSCONFBASE?= ${PREFIX}/etc -. if empty(PKG_SYSCONFSUBDIR) -PKG_SYSCONFDIR?= ${PKG_SYSCONFBASE} -. else -PKG_SYSCONFDIR?= ${PKG_SYSCONFBASE}/${PKG_SYSCONFSUBDIR} -. endif -.endif - -CONFIGURE_ENV+= PKG_SYSCONFDIR="${PKG_SYSCONFDIR}" -MAKE_ENV+= PKG_SYSCONFDIR="${PKG_SYSCONFDIR}" - .if defined(USE_JAVA) BUILD_DEFS+= PKG_JVM JAVA_HOME . if !defined(PKG_JVM) @@ -974,6 +944,36 @@ CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/inc . endif .endif +# PKG_SYSCONFDIR is where the configuration files for a package may be found. +# This value may be customized in various ways: +# +# PKG_SYSCONFBASE is the main config directory under which all package +# configuration files are to be found. +# +# PKG_SYSCONFSUBDIR is the subdirectory of PKG_SYSCONFBASE under which the +# configuration files for a particular package may be found. +# +# PKG_SYSCONFDIR.${PKGBASE} overrides the value of ${PKG_SYSCONFDIR} for a +# particular package. +# +# Users will typically want to set PKG_SYSCONFBASE to /etc, or accept the +# default location of ${PREFIX}/etc. +# +.if defined(PKG_SYSCONFDIR.${PKGBASE}) +PKG_SYSCONFDIR= ${PKG_SYSCONFDIR.${PKGBASE}} +.else +PKG_SYSCONFSUBDIR?= # empty +PKG_SYSCONFBASE?= ${PREFIX}/etc +. if empty(PKG_SYSCONFSUBDIR) +PKG_SYSCONFDIR?= ${PKG_SYSCONFBASE} +. else +PKG_SYSCONFDIR?= ${PKG_SYSCONFBASE}/${PKG_SYSCONFSUBDIR} +. endif +.endif + +CONFIGURE_ENV+= PKG_SYSCONFDIR="${PKG_SYSCONFDIR}" +MAKE_ENV+= PKG_SYSCONFDIR="${PKG_SYSCONFDIR}" + # Passed to most of script invocations SCRIPTS_ENV+= CURDIR=${.CURDIR} DISTDIR=${DISTDIR} \ PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin \ |