summaryrefslogtreecommitdiff
path: root/distrib/i386/floppies
diff options
context:
space:
mode:
authorThorsten Lockert <tholo@cvs.openbsd.org>1997-05-08 06:02:36 +0000
committerThorsten Lockert <tholo@cvs.openbsd.org>1997-05-08 06:02:36 +0000
commit937ed75bdb3593ac82105f9fc121224dcbc731b7 (patch)
tree9ca23d632bf0de23552ef9c7c673e0286d6bdfac /distrib/i386/floppies
parent7b67aeb1995a523a49127e63dc0ca7c5fc8eff8d (diff)
Remove local hacks accidentally committed
Diffstat (limited to 'distrib/i386/floppies')
-rw-r--r--distrib/i386/floppies/ramdisk/Makefile16
1 files changed, 7 insertions, 9 deletions
diff --git a/distrib/i386/floppies/ramdisk/Makefile b/distrib/i386/floppies/ramdisk/Makefile
index 0957e23c1c8..405b5b0fd09 100644
--- a/distrib/i386/floppies/ramdisk/Makefile
+++ b/distrib/i386/floppies/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 1997/05/08 05:56:21 tholo Exp $
+# $OpenBSD: Makefile,v 1.16 1997/05/08 06:02:35 tholo Exp $
TOP= ${.CURDIR}/..
@@ -17,7 +17,7 @@ VND_DEV= /dev/${VND}a
VND_RDEV= /dev/r${VND}a
VND_CRDEV= /dev/r${VND}c
PID!= echo $$$$
-REALIMAGE!= echo /var/tmp/image.${PID}
+REALIMAGE!= echo /tmp/image.${PID}
LISTFLOPPY= ${.CURDIR}/list_floppy
all: ${FS}
@@ -60,13 +60,11 @@ bsd.rd: ${IMAGE} bsd rdsetroot
${.OBJDIR}/rdsetroot bsd.rd < ${IMAGE}
bsd:
+ cd ${.CURDIR}/../../../../sys/arch/i386/conf && config RAMDISK
+ cd ${.CURDIR}/../../../../sys/arch/i386/compile/RAMDISK && \
+ make clean && make depend && make
cp ${.CURDIR}/../../../../sys/arch/i386/compile/RAMDISK/bsd bsd
-# cd ${.CURDIR}/../../../../sys/arch/i386/conf && config RAMDISK
-# cd ${.CURDIR}/../../../../sys/arch/i386/compile/RAMDISK && \
-# make clean && make depend && make
-# cp ${.CURDIR}/../../../../sys/arch/i386/compile/RAMDISK/bsd bsd
-
${IMAGE}: ${CBIN} rd_setup do_files rd_teardown
rd_setup: ${CBIN}
@@ -87,8 +85,8 @@ rd_teardown:
cp ${REALIMAGE} ${IMAGE}
rm ${REALIMAGE}
-rdsetroot: ${TOP}/common/rdsetroot.c
- ${HOSTCC} -DDEBUG -o rdsetroot ${TOP}/common/rdsetroot.c
+rdsetroot: ${TOP}/rdsetroot.c
+ ${HOSTCC} -DDEBUG -o rdsetroot ${TOP}/rdsetroot.c
unconfig:
-umount -f ${MOUNT_POINT}