Fix the packages information for ``compound'' architectures (i.e.

m68k or mips-based) to show correct paths.
Problem found by jj@, ok fries@

3 files changed, 23 insertions, 10 deletions

diff --git a/distrib/notes/Makefile b/distrib/notes/Makefile
index 450007deff5..c77279f08ae 100644
--- a/distrib/notes/Makefile
+++ b/distrib/notes/Makefile
@@ -1,9 +1,10 @@
-#	$OpenBSD: Makefile,v 1.10 1998/05/18 00:33:16 todd Exp $
+#	$OpenBSD: Makefile,v 1.11 2001/03/28 21:11:50 miod Exp $
 
 NOPROG=
 NOMAN=
 
 M?=	$(MACHINE)
+M_A?=	$(MACHINE_ARCH)
 
 TARG=	INSTALL.$M
 SRC=	$(.CURDIR)/INSTALL
@@ -15,11 +16,22 @@ DEP=	$(SRC) $(.CURDIR)/mirrors $(.CURDIR)/$M/whatis $(.CURDIR)/$M/contents \
 all:	$(TARG)
 
 allarchs:
-	@cd $(.CURDIR); for m in alpha amiga arc atari hp300 i386 mac68k mvme68k pc532 pmax powerpc sparc sun3; do make MACHINE=$$m; done
+	@cd $(.CURDIR); \
+	    make MACHINE=alpha MACHINE_ARCH=alpha; \
+	    make MACHINE=amiga MACHINE_ARCH=m68k; \
+	    make MACHINE=hp300 MACHINE_ARCH=m68k; \
+	    make MACHINE=i386 MACHINE_ARCH=i386; \
+	    make MACHINE=mac68k MACHINE_ARCH=m68k; \
+	    make MACHINE=mvme68k MACHINE_ARCH=m68k; \
+	    make MACHINE=pmax MACHINE_ARCH=mips; \
+	    make MACHINE=powerpc MACHINE_ARCH=powerpc; \
+	    make MACHINE=sparc MACHINE_ARCH=sparc; \
+	    make MACHINE=sun3 MACHINE_ARCH=m68k; \
+	    make MACHINE=vax MACHINE_ARCH=vax ;
 
 $(TARG): $(DEP)
 	m4 -DOSREV=$(OSREV) -DOSrev=$(OSrev) -DINCLUDE=$(.CURDIR)/$M \
-	-DMACHINE=$M -Uunix $(SRC) > $@
+	-DMACHINE=$M -DMACHINE_ARCH=$(M_A) -Uunix $(SRC) > $@
 
 clean cleandir:
 	-/bin/rm -f INSTALL.*
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index 82d3b7a0091..3af51ae7580 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.10 2000/05/06 20:32:48 miod Exp $
+dnl	$OpenBSD: m4.common,v 1.11 2001/03/28 21:11:50 miod Exp $
 dnl
 dnl simulate an include path with a macro 'includeit'.
 define(`includeit',`sinclude('INCLUDE/`$1)sinclude('INCLUDE/../`$1)')dnl
@@ -49,8 +49,9 @@ dnl
 dnl
 dnl Conventions when editing:
 dnl o base`'OSrev is required because if it appears as baseOSrev the defined
-dnl   value OSrev does not get substituted.  Same goes for MACHINE and OSREV,
-dnl   assigned as cmd line parameters to m4 in the Makefile.
+dnl   value OSrev does not get substituted.  Same goes for MACHINE,
+dnl   MACHINE_ARCH and OSREV, assigned as cmd line parameters to m4 in the
+dnl   Makefile.
 dnl o `include' and `define' is required as include and define are both m4
 dnl   reserved words that evaluate to NULL if not quoted.
 dnl o showsize() must not be on a new line.  It creates its own new line if
diff --git a/distrib/notes/packages b/distrib/notes/packages
index c9c7ef08634..98e761e4d2d 100644
--- a/distrib/notes/packages
+++ b/distrib/notes/packages
@@ -28,7 +28,7 @@ Installing applications from the CD-ROM package collection:
 	The OpenBSD CD-ROM ships with several applications pre-built
 	for various hardware architectures.  The number of applications
 	vary according to available disk space.  Check the directory
-	OSREV/packages/MACHINE to see which packages are available for
+	OSREV/packages/MACHINE_ARCH to see which packages are available for
 	your hardware architecture.  That directory will be on the same
 	CD-ROM containing the OS installation files for your architecture.
 
@@ -44,7 +44,7 @@ Installing applications from the CD-ROM package collection:
     Password: <enter your root password>
     # mkdir -p /cdrom
     # mount /dev/cd0a /cdrom
-    {:-#-:} pkg_add /cdrom/OSREV/packages/MACHINE/<package-name>
+    {:-#-:} pkg_add /cdrom/OSREV/packages/MACHINE_ARCH/<package-name>
     # <add more packages if desired>
     # umount /cdrom
 	
@@ -54,7 +54,7 @@ Installing applications from the CD-ROM package collection:
 Installing applications from the ftp.openbsd.org package collection:
 
 	All available packages for your architecture have been placed on
-	ftp.openbsd.org in the directory pub/OpenBSD/OSREV/packages/MACHINE/
+	ftp.openbsd.org in the directory pub/OpenBSD/OSREV/packages/MACHINE_ARCH/
 	You may want to peruse this to see what packages are available.  The
 	packages are also on the OpenBSD FTP mirror sites.  See
 
@@ -71,7 +71,7 @@ Installing applications from the ftp.openbsd.org package collection:
 
     $ su
     Password: <enter your root password>
-    {:-#-:} pkg_add ftp://ftp.openbsd.org/pub/OpenBSD/{:--:}OSREV/packages/MACHINE/emacs-20.3.tgz
+    {:-#-:} pkg_add ftp://ftp.openbsd.org/pub/OpenBSD/{:--:}OSREV/packages/MACHINE_ARCH/emacs-20.3.tgz
 
 	Packages available {:-include-:} (at least):