diff options
| author | jlam <jlam@pkgsrc.org> | 2002-06-21 21:06:48 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-06-21 21:06:48 +0000 |
| commit | 753e8e8e87869c62de5cfa153386e4e235212ce5 (patch) | |
| tree | a3e6972cf2a021709a0b2488a24dd55b6c39e1e1 /mk/bsd.prefs.mk | |
| parent | d52785d9bf4f449c6148fee26d5ffeb3abfa8db0 (diff) | |
| download | pkgsrc-753e8e8e87869c62de5cfa153386e4e235212ce5.tar.gz | |
Move the definition of OBJECT_FMT for NetBSD-1.3.x back _below_ the
inclusion of bsd.own.mk. This is to allow OBJECT_FMT to be set explicitly
in ${MAKECONF} (/etc/mk.conf) to override the setting in bsd.own.mk on the
older NetBSD systems.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 42611d414d3..8b117d0f914 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.72 2002/06/21 17:49:47 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.73 2002/06/21 21:06:48 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -129,6 +129,8 @@ MAKE_ENV+= USETOOLS=no OBJECT_FMT?= Mach-O .endif +.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" || \ @@ -140,8 +142,6 @@ OBJECT_FMT?= a.out .endif .endif -.include <bsd.own.mk> - # include the defaults file .if exists(${.CURDIR}/../../mk/bsd.pkg.defaults.mk) .include "${.CURDIR}/../../mk/bsd.pkg.defaults.mk" |