diff options
| author | agc <agc> | 2001-09-18 21:30:05 +0000 |
|---|---|---|
| committer | agc <agc> | 2001-09-18 21:30:05 +0000 |
| commit | 0ee4e581a69c34e4648b60fd6e10215ae9afe993 (patch) | |
| tree | d29968b3ea8693de378df74f2039264165f22735 /mk/bsd.prefs.mk | |
| parent | 058d6a2429967510c921a121e046015dd4d4cef1 (diff) | |
| download | pkgsrc-0ee4e581a69c34e4648b60fd6e10215ae9afe993.tar.gz | |
Add a new bsd.pkg.defaults.mk file, derived from the old mk.conf.example.
This file is "included" automatically before <bsd.own.mk> includes
/etc/mk.conf, so that pkgsrc-wide default values are set.
It is now possible just to set values in mk.conf only where they differ
from the default, thereby easing the problems of updating mk.conf when
new values get added.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 94bf42d46b5..f8b16dbc437 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.58 2001/08/24 09:00:44 abs Exp $ +# $NetBSD: bsd.prefs.mk,v 1.59 2001/09/18 21:30:06 agc Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -93,6 +93,15 @@ LOWER_ARCH?= ${MACHINE_GNU_ARCH} MACHINE_PLATFORM?= ${OPSYS}-${OS_VERSION}-${MACHINE_ARCH} MACHINE_GNU_PLATFORM?= ${LOWER_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS} +# include the defaults file +.if exists(${.CURDIR}/../../mk/bsd.pkg.defaults.mk) +.include "${.CURDIR}/../../mk/bsd.pkg.defaults.mk" +.elif exists(${.CURDIR}/../mk/bsd.pkg.defaults.mk) +.include "${.CURDIR}/../mk/bsd.pkg.defaults.mk" +.elif exists(${.CURDIR}/mk/bsd.pkg.defaults.mk) +.include "${.CURDIR}/mk/bsd.pkg.defaults.mk" +.endif + # Needed on NetBSD and SunOS (zoularis) to prevent an "install:" target # from being created in bsd.own.mk. NEED_OWN_INSTALL_TARGET=no |