summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-09-18 17:18:41 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-09-18 17:18:41 +0000
commit01329ac9e9518a403ce15ef259eff408cab7d836 (patch)
tree464e23ebc11ac3c0e836e472400fa343ff9d5567
parentb032c591fc96616a5663da6b4bffa988e7a039fe (diff)
if we start at the top of distrib, we will end up in the right place...
-rw-r--r--distrib/Makefile8
-rw-r--r--distrib/amiga/Makefile4
-rw-r--r--distrib/i386/Makefile4
-rw-r--r--distrib/pmax/Makefile5
-rw-r--r--distrib/sparc/Makefile4
5 files changed, 12 insertions, 13 deletions
diff --git a/distrib/Makefile b/distrib/Makefile
index 65cc2ba54b7..fa3e910365e 100644
--- a/distrib/Makefile
+++ b/distrib/Makefile
@@ -1,11 +1,5 @@
-# $OpenBSD: Makefile,v 1.4 1997/09/17 14:18:58 deraadt Exp $
+# $OpenBSD: Makefile,v 1.5 1997/09/18 17:18:33 deraadt Exp $
SUBDIR= special ${MACHINE} notes
-# miniroot and ramdisk are supposed to be "generic" using Makefile.inc
-# to set up architectural dependencies..
-.if (${MACHINE} == "sparc")
-SUBDIR+= ramdisk miniroot
-.endif
-
.include <bsd.subdir.mk>
diff --git a/distrib/amiga/Makefile b/distrib/amiga/Makefile
index d60624110db..da05de32fe7 100644
--- a/distrib/amiga/Makefile
+++ b/distrib/amiga/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.3 1997/05/18 15:25:16 niklas Exp $
+# $OpenBSD: Makefile,v 1.4 1997/09/18 17:18:35 deraadt Exp $
-SUBDIR= ../crunch ../miniroot ../ramdisk
+SUBDIR= ../miniroot ../ramdisk
.include <bsd.subdir.mk>
diff --git a/distrib/i386/Makefile b/distrib/i386/Makefile
index 581348d5032..2a8ad948e3d 100644
--- a/distrib/i386/Makefile
+++ b/distrib/i386/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.3 1997/09/17 14:19:19 deraadt Exp $
+# $OpenBSD: Makefile,v 1.4 1997/09/18 17:18:37 deraadt Exp $
-SUBDIR= ../crunch floppies
+SUBDIR= floppies
.include <bsd.subdir.mk>
diff --git a/distrib/pmax/Makefile b/distrib/pmax/Makefile
new file mode 100644
index 00000000000..21342e227c2
--- /dev/null
+++ b/distrib/pmax/Makefile
@@ -0,0 +1,5 @@
+# $OpenBSD: Makefile,v 1.1 1997/09/18 17:18:39 deraadt Exp $
+
+SUBDIR+= ../simpleroot
+
+.include <bsd.subdir.mk>
diff --git a/distrib/sparc/Makefile b/distrib/sparc/Makefile
index 8effd47a7b7..b0821fcf355 100644
--- a/distrib/sparc/Makefile
+++ b/distrib/sparc/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.1 1997/05/29 13:48:10 grr Exp $
+# $OpenBSD: Makefile,v 1.2 1997/09/18 17:18:40 deraadt Exp $
# $NetBSD: Makefile,v 1.2 1995/10/12 21:16:53 gwr Exp $
# at this point only the floppies directory has object, ramdisk and
# miniroot are just architeture dependent inclusions for ../ramdisk, etc.
SUBDIR= floppies
-# SUBDIR+= ramdisk miniroot
+SUBDIR+= ../ramdisk ../miniroot
.include <bsd.subdir.mk>