unify these damnit!

14 files changed, 65 insertions, 70 deletions

diff --git a/etc/etc.alpha/Makefile.inc b/etc/etc.alpha/Makefile.inc
index bd0d35e373a..a0959efec69 100644
--- a/etc/etc.alpha/Makefile.inc
+++ b/etc/etc.alpha/Makefile.inc
@@ -1,9 +1,7 @@
-#	$OpenBSD: Makefile.inc,v 1.13 2002/05/13 07:22:42 espie Exp $
-#	etc.alpha/Makefile.inc -- alpha-specific etc Makefile targets
+#	$OpenBSD: Makefile.inc,v 1.14 2006/07/27 02:53:55 deraadt Exp $
 
 .ifdef DESTDIR
-
-snap_md: bsd distrib boot
+snap_md: bsd bootlocks distrib
 	cp ${.CURDIR}/../sys/arch/alpha/compile/GENERIC/bsd \
 	    ${DESTDIR}/snapshot/bsd
 
@@ -12,12 +10,11 @@ bsd:
 	cd ${.CURDIR}/../sys/arch/alpha/compile/GENERIC && \
 	    ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
 
-
-boot:
+bootblocks:
 	cp ${DESTDIR}/usr/mdec/boot ${DESTDIR}/snapshot
 	cp ${DESTDIR}/usr/mdec/bootxx ${DESTDIR}/snapshot
 	cp ${DESTDIR}/usr/mdec/netboot ${DESTDIR}/snapshot
 
-.PHONY: bsd boot
+.PHONY: bsd bootblocks
 
 .endif	# DESTDIR check
diff --git a/etc/etc.amd64/Makefile.inc b/etc/etc.amd64/Makefile.inc
index 3e5e553a454..a99dd5814b0 100644
--- a/etc/etc.amd64/Makefile.inc
+++ b/etc/etc.amd64/Makefile.inc
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile.inc,v 1.6 2004/08/26 03:34:16 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.7 2006/07/27 02:53:55 deraadt Exp $
 
 .ifdef DESTDIR
-snap_md: bsd bsd.mp distrib bootblocks
+snap_md: bsd bsd.mp bootblocks distrib
 	cp ${.CURDIR}/../sys/arch/amd64/compile/GENERIC/bsd \
 	    ${DESTDIR}/snapshot/bsd
 	cp ${.CURDIR}/../sys/arch/amd64/compile/GENERIC.MP/bsd \
@@ -22,6 +22,6 @@ bootblocks:
 	cp ${DESTDIR}/usr/mdec/cdboot ${DESTDIR}/snapshot
 	cp ${DESTDIR}/usr/mdec/cdbr ${DESTDIR}/snapshot
 
-.PHONY: bsd bootblocks
+.PHONY: bsd bsd.mp bootblocks
 
 .endif	# DESTDIR check
diff --git a/etc/etc.armish/Makefile.inc b/etc/etc.armish/Makefile.inc
index 7fb1d4663eb..907677fddaf 100644
--- a/etc/etc.armish/Makefile.inc
+++ b/etc/etc.armish/Makefile.inc
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile.inc,v 1.3 2006/06/08 02:29:03 drahn Exp $
-#	etc.armish/Makefile.inc -- armish-specific etc Makefile targets
+#	$OpenBSD: Makefile.inc,v 1.4 2006/07/27 02:53:55 deraadt Exp $
 
 .ifdef DESTDIR
-snap_md: bsd distrib
+snap_md: bsd bootblocks distrib
 	cp ${.CURDIR}/../sys/arch/armish/compile/GENERIC/bsd \
 	    ${DESTDIR}/snapshot/bsd
 
@@ -11,6 +10,9 @@ bsd:
 	cd ${.CURDIR}/../sys/arch/armish/compile/GENERIC && \
 	    ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
 
-.PHONY: bsd
+bootblocks:
+	#none needed
+
+.PHONY: bsd bootblocks
 
 .endif	# DESTDIR check
diff --git a/etc/etc.aviion/Makefile.inc b/etc/etc.aviion/Makefile.inc
index 87eb66e29c6..85ee7110a99 100644
--- a/etc/etc.aviion/Makefile.inc
+++ b/etc/etc.aviion/Makefile.inc
@@ -1,12 +1,11 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2006/05/09 21:17:13 miod Exp $
-#	etc.aviion/Makefile.inc -- aviion-specific etc Makefile targets
+#	$OpenBSD: Makefile.inc,v 1.2 2006/07/27 02:53:55 deraadt Exp $
 
 .ifdef DESTDIR
-snap_md: bsd-generic bootblocks distrib
+snap_md: bsd bootblocks distrib
 	cp ${.CURDIR}/../sys/arch/aviion/compile/GENERIC/bsd \
 	    ${DESTDIR}/snapshot/bsd
 
-bsd-generic:
+bsd:
 	cd ${.CURDIR}/../sys/arch/aviion/conf && config GENERIC
 	cd ${.CURDIR}/../sys/arch/aviion/compile/GENERIC && \
 	    ${MAKE} clean && ${MAKE} depend && ${MAKE}
@@ -14,6 +13,6 @@ bsd-generic:
 bootblocks:
 	cp ${DESTDIR}/usr/mdec/* ${DESTDIR}/snapshot/
 
-.PHONY: bsd-generic bootblocks
+.PHONY: bsd bootblocks
 
 .endif	# DESTDIR check
diff --git a/etc/etc.cats/Makefile.inc b/etc/etc.cats/Makefile.inc
index d2dc98297e1..dcab1a80b37 100644
--- a/etc/etc.cats/Makefile.inc
+++ b/etc/etc.cats/Makefile.inc
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile.inc,v 1.4 2004/02/09 02:28:23 drahn Exp $
-#	etc.cats/Makefile.inc -- cats-specific etc Makefile targets
+#	$OpenBSD: Makefile.inc,v 1.5 2006/07/27 02:53:55 deraadt Exp $
 
 .ifdef DESTDIR
-snap_md: bsd distrib1
+snap_md: bsd bootblocks distrib
 	cp ${.CURDIR}/../sys/arch/cats/compile/GENERIC/bsd \
 	    ${DESTDIR}/snapshot/bsd
 
@@ -11,10 +10,9 @@ bsd:
 	cd ${.CURDIR}/../sys/arch/cats/compile/GENERIC && \
 	    ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
 
-# knows about bsd.rd
-distrib1:
-	${MAKE} distrib
+bootblocks:
+	#none needed
 
-.PHONY: bsd distrib1
+.PHONY: bsd bootblocks
 
 .endif	# DESTDIR check
diff --git a/etc/etc.hp300/Makefile.inc b/etc/etc.hp300/Makefile.inc
index f6338c6f876..f7b1299b793 100644
--- a/etc/etc.hp300/Makefile.inc
+++ b/etc/etc.hp300/Makefile.inc
@@ -1,5 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.18 2005/03/08 20:03:04 miod Exp $
-#	etc.hp300/Makefile.inc -- hp300-specific etc Makefile targets
+#	$OpenBSD: Makefile.inc,v 1.19 2006/07/27 02:53:55 deraadt Exp $
 
 .ifdef DESTDIR
 snap_md: bsd bootblocks distrib
diff --git a/etc/etc.hppa/Makefile.inc b/etc/etc.hppa/Makefile.inc
index f0b69a9f2d9..c8685a5d613 100644
--- a/etc/etc.hppa/Makefile.inc
+++ b/etc/etc.hppa/Makefile.inc
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile.inc,v 1.4 2003/03/28 23:20:51 mickey Exp $
+#	$OpenBSD: Makefile.inc,v 1.5 2006/07/27 02:53:55 deraadt Exp $
 
 .ifdef DESTDIR
-snap_md: boot bsd distrib
+snap_md: bootblocks bsd distrib
 	cp ${.CURDIR}/../sys/arch/hppa/compile/GENERIC/bsd \
 	    ${DESTDIR}/snapshot/bsd
 
@@ -10,9 +10,9 @@ bsd:
 	cd ${.CURDIR}/../sys/arch/hppa/compile/GENERIC && \
 	    ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
 
-boot:
+bootblocks:
 	cp ${DESTDIR}/usr/mdec/xxboot ${DESTDIR}/snapshot
 
-.PHONY: bsd
+.PHONY: bsd bootblocks
 
 .endif	# DESTDIR check
diff --git a/etc/etc.hppa64/Makefile.inc b/etc/etc.hppa64/Makefile.inc
index 72f9b10cd07..d3d7e6925c6 100644
--- a/etc/etc.hppa64/Makefile.inc
+++ b/etc/etc.hppa64/Makefile.inc
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2005/04/01 16:02:16 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.2 2006/07/27 02:53:55 deraadt Exp $
 
 .ifdef DESTDIR
-snap_md: boot bsd distrib
+snap_md: bootblocks bsd distrib
 	cp ${.CURDIR}/../sys/arch/hppa64/compile/GENERIC/bsd \
 	    ${DESTDIR}/snapshot/bsd
 
@@ -10,9 +10,9 @@ bsd:
 	cd ${.CURDIR}/../sys/arch/hppa64/compile/GENERIC && \
 	    ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
 
-boot:
+bootblocks:
 	cp ${DESTDIR}/usr/mdec/xxboot ${DESTDIR}/snapshot
 
-.PHONY: bsd
+.PHONY: bootblocks bsd
 
 .endif	# DESTDIR check
diff --git a/etc/etc.luna88k/Makefile.inc b/etc/etc.luna88k/Makefile.inc
index 2a35f45385f..1fb4b53f374 100644
--- a/etc/etc.luna88k/Makefile.inc
+++ b/etc/etc.luna88k/Makefile.inc
@@ -1,16 +1,18 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2004/04/21 18:23:44 miod Exp $
-#	etc.luna88k/Makefile.inc -- luna88k-specific etc Makefile targets
+#	$OpenBSD: Makefile.inc,v 1.2 2006/07/27 02:53:55 deraadt Exp $
 
 .ifdef DESTDIR
-snap_md: bsd-generic distrib
+snap_md: bsd bootblocks distrib
 	cp ${.CURDIR}/../sys/arch/luna88k/compile/GENERIC/bsd \
 	    ${DESTDIR}/snapshot/bsd
 
-bsd-generic:
+bsd:
 	cd ${.CURDIR}/../sys/arch/luna88k/conf && config GENERIC
 	cd ${.CURDIR}/../sys/arch/luna88k/compile/GENERIC && \
 	    ${MAKE} clean && ${MAKE} depend && ${MAKE}
 
-.PHONY: bsd-generic
+bootblocks:
+	#none needed
+
+.PHONY: bsd bootblocks
 
 .endif	# DESTDIR check
diff --git a/etc/etc.mac68k/Makefile.inc b/etc/etc.mac68k/Makefile.inc
index b4761c01013..dabfdfb72dc 100644
--- a/etc/etc.mac68k/Makefile.inc
+++ b/etc/etc.mac68k/Makefile.inc
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile.inc,v 1.9 2004/12/03 06:37:51 miod Exp $
-#	etc.mac68k/Makefile.inc -- mac68k-specific etc Makefile targets
+#	$OpenBSD: Makefile.inc,v 1.10 2006/07/27 02:53:55 deraadt Exp $
 
 .ifdef DESTDIR
-snap_md: bsd distrib
+snap_md: bsd bootblocks distrib
 	cp ${.CURDIR}/../sys/arch/mac68k/compile/GENERIC/bsd \
 	    ${DESTDIR}/snapshot/bsd
 	printf "disable ncrscsi\nenable sbc\nquit" | config -e \
@@ -13,6 +12,9 @@ bsd:
 	cd ${.CURDIR}/../sys/arch/mac68k/compile/GENERIC && \
 	    ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
 
-.PHONY: bsd
+bootblocks:
+	#none needed
+
+.PHONY: bsd bootblocks
 
 .endif	# DESTDIR check
diff --git a/etc/etc.macppc/Makefile.inc b/etc/etc.macppc/Makefile.inc
index 6d12c91df0f..eb929840526 100644
--- a/etc/etc.macppc/Makefile.inc
+++ b/etc/etc.macppc/Makefile.inc
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile.inc,v 1.7 2003/03/24 18:57:21 drahn Exp $
-#	etc.macppc/Makefile.inc -- macppc-specific etc Makefile targets
+#	$OpenBSD: Makefile.inc,v 1.8 2006/07/27 02:53:55 deraadt Exp $
 
 .ifdef DESTDIR
-snap_md: bsd distrib1
+snap_md: bsd bootblocks distrib gzip_bsd.rd
 	cp ${.CURDIR}/../sys/arch/macppc/compile/GENERIC/bsd \
 	    ${DESTDIR}/snapshot/bsd
 
@@ -11,14 +10,14 @@ bsd:
 	cd ${.CURDIR}/../sys/arch/macppc/compile/GENERIC && \
 	    ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
 
-# knows about bsd.rd
-distrib1:
+bootblocks:
 	cp ${DESTDIR}/usr/mdec/ofwboot ${DESTDIR}/snapshot/ofwboot
 	cp ${DESTDIR}/usr/mdec/bsd.tbxi ${DESTDIR}/snapshot/bsd.tbxi
-	${MAKE} distrib
+
+gzip_bsd.rd:
 	gzip -9 ${DESTDIR}/snapshot/bsd.rd
 	mv ${DESTDIR}/snapshot/bsd.rd.gz ${DESTDIR}/snapshot/bsd.rd
 
-.PHONY: bsd distrib1
+.PHONY: bootblocks bsd gzip_bsd.rd
 
 .endif	# DESTDIR check
diff --git a/etc/etc.mvme68k/Makefile.inc b/etc/etc.mvme68k/Makefile.inc
index 9520d4699eb..e318bd7cd97 100644
--- a/etc/etc.mvme68k/Makefile.inc
+++ b/etc/etc.mvme68k/Makefile.inc
@@ -1,12 +1,11 @@
-#	$OpenBSD: Makefile.inc,v 1.8 2002/05/13 07:22:43 espie Exp $
-#	etc.mvme68k/Makefile.inc -- mvme68k-specific etc Makefile targets
+#	$OpenBSD: Makefile.inc,v 1.9 2006/07/27 02:53:55 deraadt Exp $
 
 .ifdef DESTDIR
-snap_md: bsd-generic bootblocks distrib
+snap_md: bsd bootblocks distrib
 	cp ${.CURDIR}/../sys/arch/mvme68k/compile/GENERIC/bsd \
 	    ${DESTDIR}/snapshot/bsd
 
-bsd-generic:
+bsd:
 	cd ${.CURDIR}/../sys/arch/mvme68k/conf && config GENERIC
 	cd ${.CURDIR}/../sys/arch/mvme68k/compile/GENERIC && \
 	    ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
@@ -14,6 +13,6 @@ bsd-generic:
 bootblocks:
 	cp ${DESTDIR}/usr/mdec/* ${DESTDIR}/snapshot/
 
-.PHONY: bsd-generic bootblocks
+.PHONY: bsd bootblocks
 
 .endif	# DESTDIR check
diff --git a/etc/etc.mvme88k/Makefile.inc b/etc/etc.mvme88k/Makefile.inc
index 1bbdba53cc8..6665af09864 100644
--- a/etc/etc.mvme88k/Makefile.inc
+++ b/etc/etc.mvme88k/Makefile.inc
@@ -1,18 +1,18 @@
-#	$OpenBSD: Makefile.inc,v 1.6 2003/08/15 13:37:56 miod Exp $
-#	etc.mvme88k/Makefile.inc -- mvme88k-specific etc Makefile targets
+#	$OpenBSD: Makefile.inc,v 1.7 2006/07/27 02:53:55 deraadt Exp $
 
 .ifdef DESTDIR
-snap_md: bsd-generic bootblocks distrib
+snap_md: bsd bootblocks distrib
 	cp ${.CURDIR}/../sys/arch/mvme88k/compile/GENERIC/bsd \
 	    ${DESTDIR}/snapshot/bsd
 
-bsd-generic:
+bsd:
 	cd ${.CURDIR}/../sys/arch/mvme88k/conf && config GENERIC
 	cd ${.CURDIR}/../sys/arch/mvme88k/compile/GENERIC && \
 	    ${MAKE} clean && ${MAKE} depend && ${MAKE}
+
 bootblocks:
 	cp ${DESTDIR}/usr/mdec/* ${DESTDIR}/snapshot/
 
-.PHONY: bsd-generic bootblocks
+.PHONY: bsd bootblocks
 
 .endif	# DESTDIR check
diff --git a/etc/etc.sgi/Makefile.inc b/etc/etc.sgi/Makefile.inc
index 01608ca3978..5e264a79e3f 100644
--- a/etc/etc.sgi/Makefile.inc
+++ b/etc/etc.sgi/Makefile.inc
@@ -1,9 +1,7 @@
-#	$OpenBSD: Makefile.inc,v 1.3 2006/07/24 18:11:47 deraadt Exp $
-#	etc.sgi/Makefile.inc -- sgi-specific etc Makefile targets
+#	$OpenBSD: Makefile.inc,v 1.4 2006/07/27 02:53:55 deraadt Exp $
 
 .ifdef DESTDIR
-
-snap_md: bsd distrib1
+snap_md: bsd bootblocks distrib
 	cp ${.CURDIR}/../sys/arch/sgi/compile/GENERIC/bsd \
 	    ${DESTDIR}/snapshot/bsd
 
@@ -12,9 +10,9 @@ bsd:
 	cd ${.CURDIR}/../sys/arch/sgi/compile/GENERIC && \
 	    ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
 
-distrib1:
-	${MAKE} distrib
+bootblocks:
+	#none needed
 
-.PHONY: bsd distrib1
+.PHONY: bsd bootblocks
 
-.endif
+.endif	# DESTDIR check