diff options
| author | jschauma <jschauma@pkgsrc.org> | 2003-01-14 03:01:37 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2003-01-14 03:01:37 +0000 |
| commit | d07838581f2afe9f060337768692e24b87bab90d (patch) | |
| tree | 6a44942d6589b988ac8d4180dd55336db97939fd /mk/bsd.prefs.mk | |
| parent | 8ba929f813918a63c1b936457a6ade96ec061b78 (diff) | |
| download | pkgsrc-d07838581f2afe9f060337768692e24b87bab90d.tar.gz | |
On Linux, LOWER_ARCH is generally not yet defined. Move assignment.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index cb39c960317..e903e2c31b9 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.101 2003/01/12 22:36:14 jschauma Exp $ +# $NetBSD: bsd.prefs.mk,v 1.102 2003/01/14 03:01:37 jschauma Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -88,12 +88,11 @@ LOWER_OPSYS?= solaris .elif ${OPSYS} == "Linux" LOWER_OPSYS?= linux -LOWER_ARCH:= ${LOWER_ARCH:C/i.86/i386/} MACHINE_ARCH:= ${MACHINE_ARCH:C/i.86/i386/} -. if ${MACHINE_ARCH} == "unknown" -. if !defined(LOWER_ARCH) +. if !defined(LOWER_ARCH) LOWER_ARCH!= ${UNAME} -m | sed -e 's/i.86/i386/' -. endif # !defined(LOWER_ARCH) +. endif # !defined(LOWER_ARCH) +. if ${MACHINE_ARCH} == "unknown" MACHINE_ARCH= ${LOWER_ARCH} MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH} . if ${LOWER_ARCH} == "i386" |