summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2002-10-07 19:31:02 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2002-10-07 19:31:02 +0000
commit26148604281efd70f3140afd38a5a825e8860aee (patch)
treeccd1e00d60a1b62d9b23b22d3f1d5ff6cc900596 /distrib
parentdaca45b2e2fe51770fdf141620b1a04d8143ba13 (diff)
Devise the appropriate MACHINE_ARCH from MACHINE, rather than requiring
the Makefile to provide this value. Makes the generation of all the installation notes easier.
Diffstat (limited to 'distrib')
-rw-r--r--distrib/notes/Makefile18
-rw-r--r--distrib/notes/m4.common15
2 files changed, 17 insertions, 16 deletions
diff --git a/distrib/notes/Makefile b/distrib/notes/Makefile
index 402f4decfd9..8e2f3168e46 100644
--- a/distrib/notes/Makefile
+++ b/distrib/notes/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2001/09/24 19:34:22 miod Exp $
+# $OpenBSD: Makefile,v 1.16 2002/10/07 19:31:01 miod Exp $
NOPROG=
NOMAN=
M?= $(MACHINE)
-M_A?= $(MACHINE_ARCH)
TARG= INSTALL.$M
SRC= $(.CURDIR)/INSTALL
@@ -17,21 +16,12 @@ all: $(TARG)
allarchs:
@cd $(.CURDIR); \
- ${MAKE} M=alpha M_A=alpha; \
- ${MAKE} M=amiga M_A=m68k; \
- ${MAKE} M=hp300 M_A=m68k; \
- ${MAKE} M=i386 M_A=i386; \
- ${MAKE} M=mac68k M_A=m68k; \
- ${MAKE} M=macppc M_A=powerpc; \
- ${MAKE} M=mvme68k M_A=m68k; \
- ${MAKE} M=sparc M_A=sparc; \
- ${MAKE} M=sparc64 M_A=sparc64; \
- ${MAKE} M=sun3 M_A=m68k; \
- ${MAKE} M=vax M_A=vax;
+ for arch in alpha amiga hp300 i386 mac68k macppc mvme68k sparc \
+ sparc64 sun3 vax ; do ${MAKE} M=$$arch; done;
$(TARG): $(DEP)
m4 -DOSREV=$(OSREV) -DOSrev=$(OSrev) -DINCLUDE=$(.CURDIR)/$M \
- -DMACHINE=$M -DMACHINE_ARCH=$(M_A) -Uunix $(SRC) > $@
+ -DMACHINE=$M -Uunix $(SRC) > $@
clean cleandir:
-/bin/rm -f INSTALL.*
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index d675faafa5d..c34a4bb205b 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,6 +1,17 @@
dnl
-dnl $OpenBSD: m4.common,v 1.37 2002/07/25 19:29:29 miod Exp $
-dnl
+dnl $OpenBSD: m4.common,v 1.38 2002/10/07 19:31:01 miod Exp $
+dnl
+dnl a simple MACHINE->MACHINE_ARCH converter.
+define(`MACHINE_ARCH',
+`ifelse(
+MACHINE,amiga,m68k,
+MACHINE,hp300,m68k,
+MACHINE,mac68k,m68k,
+MACHINE,macppc,powerpc,
+MACHINE,mvme68k,m68k,
+MACHINE,mvmeppc,powerpc,
+MACHINE,sun3,m68k,
+MACHINE)')dnl
dnl simulate an include path with a macro 'includeit'.
define(`includeit',`sinclude('INCLUDE/`$1)sinclude('INCLUDE/../`$1)')dnl
dnl