summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2011-03-22 17:34:57 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2011-03-22 17:34:57 +0000
commit306ad49efafb2d9b56eae66572cee0eabb7e3a20 (patch)
tree388ad040fcf27a922154ca20ca942594257f3317
parent7945785087793880a792ee914eedfcecc6379ad6 (diff)
Make this like other ramdisk Makefiles (those of you who are currently
doing cross-builds will want to maintain your own diffs for now)
-rw-r--r--distrib/beagle/ramdisk/Makefile12
1 files changed, 3 insertions, 9 deletions
diff --git a/distrib/beagle/ramdisk/Makefile b/distrib/beagle/ramdisk/Makefile
index b18286d0f9b..24d6126e951 100644
--- a/distrib/beagle/ramdisk/Makefile
+++ b/distrib/beagle/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2011/03/14 16:40:23 drahn Exp $
+# $OpenBSD: Makefile,v 1.2 2011/03/22 17:34:56 deraadt Exp $
REV= ${OSrev}
@@ -21,14 +21,8 @@ VND_RDEV= /dev/r${VND}a
VND_CRDEV= /dev/r${VND}c
PID!= echo $$$$
-OBJARG=
-# XXX - the following for cross builds. shouldn't be here for native
-.if ${HOST} != ${TARGET}
-OBJARG=-O obj.${HOST}.${TARGET}
-.endif
DISKTYPE= rdroot2.5M
-#NBLKS= 8192
NBLKS= 5120
# minfree, opt, b/i trks, sects, cpg
NEWFSARGS= -m 0 -o space -i 4096
@@ -85,7 +79,7 @@ unconfig:
.PRECIOUS: ${IMAGE}
${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
- crunchgen -E ${OBJARG} -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
+ crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
${MAKE} -f ${CBIN}.mk all
@@ -109,7 +103,7 @@ clean cleandir:
.ifdef RELEASEDIR
install:
cp ${BSD_RD} ${RELEASEDIR}
-.endif
+.endif # RELEASEDIR
.include <bsd.obj.mk>
.include <bsd.subdir.mk>