move common distrib rules to main Makefile,

make -> ${MAKE}
add phony targets
remove unnecessary subshells
install kernel in a separate target from building.
some SUDO.

okay deraadt@

(checked bootstrap on i386, should be safe elsewhere, and trivial to fix
anyways)

1 files changed, 8 insertions, 10 deletions

diff --git a/etc/etc.hp300/Makefile.inc b/etc/etc.hp300/Makefile.inc
index 6396e72320d..4d23ed2edde 100644
--- a/etc/etc.hp300/Makefile.inc
+++ b/etc/etc.hp300/Makefile.inc
@@ -1,29 +1,27 @@
-#	$OpenBSD: Makefile.inc,v 1.16 1999/08/18 17:27:14 downsj Exp $
+#	$OpenBSD: Makefile.inc,v 1.17 2002/05/13 07:22:42 espie Exp $
 #	etc.hp300/Makefile.inc -- hp300-specific etc Makefile targets
 
 .ifdef DESTDIR
 snap_md: bsd bsd.dl bootblocks distrib
+	cp ${.CURDIR}/../sys/arch/hp300/compile/GENERIC/bsd \
+	    ${DESTDIR}/snapshot/bsd
+	cp ${.CURDIR}/../sys/arch/hp300/compile/DISKLESS/bsd \
+	    ${DESTDIR}/snapshot/bsd.dl
 
 bsd:
 	cd ${.CURDIR}/../sys/arch/hp300/conf && config GENERIC
 	cd ${.CURDIR}/../sys/arch/hp300/compile/GENERIC && \
-	    make clean && make depend && make
-	cp ${.CURDIR}/../sys/arch/hp300/compile/GENERIC/bsd \
-	    ${DESTDIR}/snapshot/bsd
+	    ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
 
 bsd.dl:
 	cd ${.CURDIR}/../sys/arch/hp300/conf && config DISKLESS
 	cd ${.CURDIR}/../sys/arch/hp300/compile/DISKLESS && \
-	    make clean && make depend && make
-	cp ${.CURDIR}/../sys/arch/hp300/compile/DISKLESS/bsd \
-	    ${DESTDIR}/snapshot/bsd.dl
+	    ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
 
 bootblocks:
 	cp ${DESTDIR}/usr/mdec/uboot.lif ${DESTDIR}/snapshot/SYS_UBOOT
 	cp ${DESTDIR}/usr/mdec/cdboot.lif ${DESTDIR}/snapshot/SYS_CDBOOT
 
-distrib:
-	cd ${.CURDIR}/../distrib && make cleandir && \
-	    make && make install
+.PHONY: bsd bsd.dl bootblocks
 
 .endif	# DESTDIR check