diff options
| -rw-r--r-- | etc/etc.alpha/Makefile.inc | 8 | ||||
| -rw-r--r-- | etc/etc.amiga/Makefile.inc | 12 | ||||
| -rw-r--r-- | etc/etc.arc/Makefile.inc | 8 | ||||
| -rw-r--r-- | etc/etc.i386/Makefile.inc | 11 | ||||
| -rw-r--r-- | etc/etc.mvme68k/Makefile.inc | 8 | ||||
| -rw-r--r-- | etc/etc.pmax/Makefile.inc | 8 | ||||
| -rw-r--r-- | etc/etc.sparc/Makefile.inc | 20 |
7 files changed, 32 insertions, 43 deletions
diff --git a/etc/etc.alpha/Makefile.inc b/etc/etc.alpha/Makefile.inc index b655eca5df1..e7fd2847dcd 100644 --- a/etc/etc.alpha/Makefile.inc +++ b/etc/etc.alpha/Makefile.inc @@ -1,11 +1,11 @@ # # etc.alpha/Makefile.inc -- alpha-specific etc Makefile targets # -# $Id: Makefile.inc,v 1.7 1997/05/24 21:39:06 graichen Exp $ +# $Id: Makefile.inc,v 1.8 1997/09/18 17:17:32 deraadt Exp $ .ifdef DESTDIR -snap_md: binutils bsd floppy +snap_md: binutils bsd distrib binutils: cd ${DESTDIR} && tar cf - usr/*openbsd* \ @@ -18,8 +18,8 @@ bsd: cp ${.CURDIR}/../sys/arch/alpha/compile/GENERIC/bsd \ ${DESTDIR}/snapshot/bsd -floppy: - cd ${.CURDIR}/../distrib/alpha/ramdisk && \ +distrib: + cd ${.CURDIR}/../distrib && \ make cleandir && make && make install .endif # DESTDIR check diff --git a/etc/etc.amiga/Makefile.inc b/etc/etc.amiga/Makefile.inc index e3db395ab42..56c493caca8 100644 --- a/etc/etc.amiga/Makefile.inc +++ b/etc/etc.amiga/Makefile.inc @@ -1,21 +1,19 @@ # # etc.amiga/Makefile.inc -- amiga-specific etc Makefile targets # -# $OpenBSD: Makefile.inc,v 1.10 1997/05/24 18:59:57 niklas Exp $ +# $OpenBSD: Makefile.inc,v 1.11 1997/09/18 17:17:35 deraadt Exp $ # $NetBSD: Makefile.inc,v 1.7 1995/11/28 05:40:21 jtc Exp $ .ifdef DESTDIR -snap_md: miniroot ramdisk +snap_md: bsd distrib -miniroot: +bsd: # The GENERIC kernel is built as a side-effect of the miniroot cp ${.CURDIR}/../sys/arch/amiga/compile/GENERIC/bsd \ ${DESTDIR}/snapshot/bsd - cd ${.CURDIR}/../distrib/miniroot && \ - ${MAKE} cleandir && ${MAKE} && ${MAKE} install -ramdisk: - cd ${.CURDIR}/../distrib/ramdisk && \ +distrib: + cd ${.CURDIR}/../distrib && \ ${MAKE} cleandir && ${MAKE} && ${MAKE} install .endif # DESTDIR check diff --git a/etc/etc.arc/Makefile.inc b/etc/etc.arc/Makefile.inc index 39bd6700053..f9eca8921db 100644 --- a/etc/etc.arc/Makefile.inc +++ b/etc/etc.arc/Makefile.inc @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.3 1997/05/18 13:42:37 pefo Exp $ +# $OpenBSD: Makefile.inc,v 1.4 1997/09/18 17:17:35 deraadt Exp $ # # etc.arc/Makefile.inc -- arc-specific etc Makefile targets .ifdef DESTDIR -snap_md: binutils bsd ramdisk +snap_md: binutils bsd distrib binutils: cd ${DESTDIR} && tar cf - usr/*openbsd* \ @@ -19,8 +19,8 @@ bsd: cp ${.CURDIR}/../sys/arch/arc/compile/GENERIC/bsd.ecoff \ ${DESTDIR}/snapshot/bsd.ecoff -ramdisk: - cd ${.CURDIR}/../distrib/arc/ramdisk && make cleandir && \ +distrib: + cd ${.CURDIR}/../distrib && make cleandir && \ make && make install .endif diff --git a/etc/etc.i386/Makefile.inc b/etc/etc.i386/Makefile.inc index 3ba34bb632d..f9c6b8356da 100644 --- a/etc/etc.i386/Makefile.inc +++ b/etc/etc.i386/Makefile.inc @@ -1,10 +1,10 @@ # # etc.i386/Makefile.inc -- i386-specific etc Makefile targets # -# $Id: Makefile.inc,v 1.5 1997/04/20 12:42:26 niklas Exp $ +# $Id: Makefile.inc,v 1.6 1997/09/18 17:17:36 deraadt Exp $ .ifdef DESTDIR -snap_md: bsd floppy +snap_md: bsd distrib bsd: cd ${.CURDIR}/../sys/arch/i386/conf && config GENERIC @@ -13,9 +13,8 @@ bsd: cp ${.CURDIR}/../sys/arch/i386/compile/GENERIC/bsd \ ${DESTDIR}/snapshot/bsd -floppy: - cd ${.CURDIR}/../distrib/i386/floppies/ramdisk && \ - make cleandir && make && make install - +distrib: + cd ${.CURDIR}/../distrib && make cleandir && \ + make && make install .endif # DESTDIR check diff --git a/etc/etc.mvme68k/Makefile.inc b/etc/etc.mvme68k/Makefile.inc index bdf995bd208..7623ac919f2 100644 --- a/etc/etc.mvme68k/Makefile.inc +++ b/etc/etc.mvme68k/Makefile.inc @@ -1,10 +1,10 @@ # # etc.mvme68k/Makefile.inc -- mvme68k-specific etc Makefile targets # -# $Id: Makefile.inc,v 1.5 1997/05/10 22:45:16 deraadt Exp $ +# $Id: Makefile.inc,v 1.6 1997/09/18 17:17:37 deraadt Exp $ .ifdef DESTDIR -snap_md: bsd-generic bootblocks ramdisk +snap_md: bsd-generic bootblocks distrib cp ${.CURDIR}/../sys/arch/mvme68k/compile/GENERIC/bsd \ ${DESTDIR}/snapshot/bsd @@ -16,8 +16,8 @@ bsd-generic: bootblocks: cp ${DESTDIR}/usr/mdec/* ${DESTDIR}/snapshot/ -ramdisk: - cd ${.CURDIR}/../distrib/mvme68k/ramdisk && make cleandir && \ +distrib: + cd ${.CURDIR}/../distrib && make cleandir && \ make && make install .endif # DESTDIR check diff --git a/etc/etc.pmax/Makefile.inc b/etc/etc.pmax/Makefile.inc index 7bed59fb146..4488cf40ed7 100644 --- a/etc/etc.pmax/Makefile.inc +++ b/etc/etc.pmax/Makefile.inc @@ -1,11 +1,11 @@ # # etc.pmax/Makefile.inc -- pmax-specific etc Makefile targets # -# $Id: Makefile.inc,v 1.7 1997/05/14 07:37:08 graichen Exp $ +# $Id: Makefile.inc,v 1.8 1997/09/18 17:17:39 deraadt Exp $ .ifdef DESTDIR -snap_md: binutils bsd simpleroot +snap_md: binutils bsd distrib cp ${.CURDIR}/../sys/arch/sparc/compile/GENERIC/bsd \ ${DESTDIR}/snapshot/bsd @@ -34,8 +34,8 @@ bsd.rz0: cp ${.CURDIR}/../sys/arch/pmax/compile/GENERIC.rz0/bsd \ ${DESTDIR}/snapshot/bsd.rz0 -simpleroot: - cd ${.CURDIR}/../distrib/simpleroot && make cleandir && \ +distrib: + cd ${.CURDIR}/../distrib && make cleandir && \ make && make install .endif # DESTDIR check diff --git a/etc/etc.sparc/Makefile.inc b/etc/etc.sparc/Makefile.inc index f69a1042d42..713323b00ce 100644 --- a/etc/etc.sparc/Makefile.inc +++ b/etc/etc.sparc/Makefile.inc @@ -1,10 +1,10 @@ # # etc.sparc/Makefile.inc -- sparc-specific etc Makefile targets # -# $Id: Makefile.inc,v 1.6 1997/05/14 22:06:41 deraadt Exp $ +# $Id: Makefile.inc,v 1.7 1997/09/18 17:17:40 deraadt Exp $ .ifdef DESTDIR -snap_md: bsd bsd.scsi3 floppies miniroot bootblocks ramdisk +snap_md: bsd bsd.scsi3 bootblocks distrib cp ${.CURDIR}/../sys/arch/sparc/compile/GENERIC/bsd \ ${DESTDIR}/snapshot/bsd cp ${.CURDIR}/../sys/arch/sparc/compile/GENERIC_SCSI3/bsd \ @@ -20,19 +20,11 @@ bsd.scsi3: cd ${.CURDIR}/../sys/arch/sparc/compile/GENERIC_SCSI3 && \ make clean && make depend && make -floppies: - cd ${.CURDIR}/../distrib/sparc/floppies && make cleandir && \ - make && make install - -miniroot: - cd ${.CURDIR}/../distrib/miniroot && make cleandir && \ - make && make install - -ramdisk: - cd ${.CURDIR}/../distrib/ramdisk && make cleandir && \ - make && make install - bootblocks: cp ${DESTDIR}/usr/mdec/*boot* ${DESTDIR}/snapshot +distrib: + cd ${.CURDIR}/../distrib && make cleandir && \ + make && make install + .endif # DESTDIR check |