diff options
| author | tron <tron> | 2001-09-21 15:28:35 +0000 |
|---|---|---|
| committer | tron <tron> | 2001-09-21 15:28:35 +0000 |
| commit | 9716bc6d9f13e35e881b84d1173f6df75ffcd57b (patch) | |
| tree | 5b1112de4cfe01d1f473d17fde251f39fd90f13a /mk | |
| parent | 67160a62f05d0ab36dd02dd77662ffb071308488 (diff) | |
| download | pkgsrc-9716bc6d9f13e35e881b84d1173f6df75ffcd57b.tar.gz | |
Include "bsd.own.mk" before "bsd.pkg.defaults.mk" because otherwise "?="
assignments in "/etc/mk.conf" won't work anymore.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index f8b16dbc437..49cdc897ac9 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.59 2001/09/18 21:30:06 agc Exp $ +# $NetBSD: bsd.prefs.mk,v 1.60 2001/09/21 15:28:35 tron 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,12 @@ LOWER_ARCH?= ${MACHINE_GNU_ARCH} MACHINE_PLATFORM?= ${OPSYS}-${OS_VERSION}-${MACHINE_ARCH} MACHINE_GNU_PLATFORM?= ${LOWER_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS} +# Needed on NetBSD and SunOS (zoularis) to prevent an "install:" target +# from being created in bsd.own.mk. +NEED_OWN_INSTALL_TARGET=no + +.include <bsd.own.mk> + # include the defaults file .if exists(${.CURDIR}/../../mk/bsd.pkg.defaults.mk) .include "${.CURDIR}/../../mk/bsd.pkg.defaults.mk" @@ -102,12 +108,6 @@ MACHINE_GNU_PLATFORM?= ${LOWER_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS} .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 - -.include <bsd.own.mk> - # /usr/share/mk/bsd.own.mk on NetBSD 1.3 does not define OBJECT_FMT .if ${MACHINE_PLATFORM:MNetBSD-1.3*} != "" .if ${MACHINE_ARCH} == "alpha" || \ |