diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-04-30 09:18:21 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-04-30 09:18:21 +0000 |
| commit | 16d26a892445f1d54ace812fa19c782a6548797d (patch) | |
| tree | 169d788b00b46f9b4d790efc16f6769ed1fe6947 /distrib/mac68k | |
| parent | 48931635f3e143c0bb18604c872300d0d7cd66fc (diff) | |
use makeconf.awk throughout, delete instbin in Makefile
Diffstat (limited to 'distrib/mac68k')
| -rw-r--r-- | distrib/mac68k/ramdisk/Makefile | 3 | ||||
| -rw-r--r-- | distrib/mac68k/ramdisk/Makefile.inc | 5 | ||||
| -rw-r--r-- | distrib/mac68k/ramdisk/list | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/distrib/mac68k/ramdisk/Makefile b/distrib/mac68k/ramdisk/Makefile index 769e9491429..811ba01fcd0 100644 --- a/distrib/mac68k/ramdisk/Makefile +++ b/distrib/mac68k/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2002/04/28 18:28:34 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2002/04/30 09:18:20 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -91,6 +91,7 @@ do_files: TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ sh ${UTILS}/runlist.sh ${LISTS} + rm ${MOUNT_POINT}/${CBIN} clean cleandir: /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.conf ${CBIN}.mk ${CBIN}.cache \ diff --git a/distrib/mac68k/ramdisk/Makefile.inc b/distrib/mac68k/ramdisk/Makefile.inc index 261aae7b996..38d6c82716f 100644 --- a/distrib/mac68k/ramdisk/Makefile.inc +++ b/distrib/mac68k/ramdisk/Makefile.inc @@ -1,11 +1,11 @@ # -# $OpenBSD: Makefile.inc,v 1.3 2002/04/28 18:28:34 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2002/04/30 09:18:20 deraadt Exp $ # $NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $ # # TOP is assumed to be defined by Makefile including this one. -CBIN?= rmainst +CBIN?= instbin LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot @@ -35,6 +35,7 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS} + rm ${MOUNT_POINT}/${CBIN} clean cleandir: /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c diff --git a/distrib/mac68k/ramdisk/list b/distrib/mac68k/ramdisk/list index 4c1201e6a41..541013d1c6a 100644 --- a/distrib/mac68k/ramdisk/list +++ b/distrib/mac68k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.14 2002/04/30 01:31:20 deraadt Exp $ +# $OpenBSD: list,v 1.15 2002/04/30 09:18:20 deraadt Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -43,7 +43,6 @@ LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/ftp LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/sed -SPECIAL rm instbin # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV |