diff options
| author | jmmv <jmmv> | 2004-04-07 12:05:37 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2004-04-07 12:05:37 +0000 |
| commit | 7aeccd7543b806ec99ba9417700f2d62cad81215 (patch) | |
| tree | 5651de781bc6d2a1440e39cfab0c641a15be19ce /bootstrap/mods | |
| parent | 97eb7baf46b1e5561000db1828e89284576b3404 (diff) | |
| download | pkgsrc-7aeccd7543b806ec99ba9417700f2d62cad81215.tar.gz | |
Add support for the --sysconfdir argument, which changes the location of
configuration files.
From now on, mk.conf is first searched under the value passed to the
sysconfdir argument (which defaults to ${prefix}/etc, to match pkgsrc's
PKG_SYSCONFDIR default value). If not found, /etc/mk.conf is tried, to
not break existing installations which have the file in that location.
This is done to help with non-root installations of pkgsrc.
Also change pkgsrc's PKG_SYSCONFBASE value to match what is given to
sysconfdir, for consistency.
While doing this, rename $opsys.own.mk files to $opsys.own.mk.in for clarity,
as they now need sed replacements to work (i.e., the SYSCONFDIR stuff).
Diffstat (limited to 'bootstrap/mods')
| -rw-r--r-- | bootstrap/mods/mk/IRIX.own.mk.in (renamed from bootstrap/mods/mk/IRIX.own.mk) | 4 | ||||
| -rw-r--r-- | bootstrap/mods/mk/OpenBSD.bsd.own.mk.in (renamed from bootstrap/mods/mk/OpenBSD.bsd.own.mk) | 4 | ||||
| -rw-r--r-- | bootstrap/mods/mk/bsd.own.mk.in | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/bootstrap/mods/mk/IRIX.own.mk b/bootstrap/mods/mk/IRIX.own.mk.in index 04c3634df84..2a281781468 100644 --- a/bootstrap/mods/mk/IRIX.own.mk +++ b/bootstrap/mods/mk/IRIX.own.mk.in @@ -1,10 +1,12 @@ -# $NetBSD: IRIX.own.mk,v 1.1.1.1 2004/03/11 13:04:00 grant Exp $ +# $NetBSD: IRIX.own.mk.in,v 1.1 2004/04/07 12:05:38 jmmv Exp $ .if !defined(_IRIX_OWN_MK_) _IRIX_OWN_MK_=1 .if defined(MAKECONF) && exists(${MAKECONF}) .include "${MAKECONF}" +.elif exists(@SYSCONFDIR@/mk.conf) +.include "@SYSCONFDIR@/mk.conf" .elif exists(/etc/mk.conf) .include "/etc/mk.conf" .endif diff --git a/bootstrap/mods/mk/OpenBSD.bsd.own.mk b/bootstrap/mods/mk/OpenBSD.bsd.own.mk.in index e0814b9af18..ffa2a5b02c5 100644 --- a/bootstrap/mods/mk/OpenBSD.bsd.own.mk +++ b/bootstrap/mods/mk/OpenBSD.bsd.own.mk.in @@ -1,4 +1,4 @@ -# $NetBSD: OpenBSD.bsd.own.mk,v 1.1.1.1 2004/03/11 13:04:00 grant Exp $ +# $NetBSD: OpenBSD.bsd.own.mk.in,v 1.1 2004/04/07 12:05:38 jmmv Exp $ .if !defined(_BSD_OWN_MK_) _BSD_OWN_MK_=1 @@ -8,6 +8,8 @@ _BSD_OWN_MK_=1 .if defined(MAKECONF) && exists(${MAKECONF}) .include "${MAKECONF}" +.elif exists(@SYSCONFDIR@/mk.conf) +.include "@SYSCONFDIR@/mk.conf" .elif exists(/etc/mk.conf) .include "/etc/mk.conf" .endif diff --git a/bootstrap/mods/mk/bsd.own.mk.in b/bootstrap/mods/mk/bsd.own.mk.in index 17f4ab76bd7..2866aa9e58f 100644 --- a/bootstrap/mods/mk/bsd.own.mk.in +++ b/bootstrap/mods/mk/bsd.own.mk.in @@ -1,10 +1,12 @@ -# $NetBSD: bsd.own.mk.in,v 1.2 2004/03/11 17:29:11 tv Exp $ +# $NetBSD: bsd.own.mk.in,v 1.3 2004/04/07 12:05:38 jmmv Exp $ .if !defined(_BSD_OWN_MK_) _BSD_OWN_MK_=1 .if defined(MAKECONF) && exists(${MAKECONF}) .include "${MAKECONF}" +.elif exists(@SYSCONFDIR@/mk.conf) +.include "@SYSCONFDIR@/mk.conf" .elif exists(/etc/mk.conf) .include "/etc/mk.conf" .endif |