summaryrefslogtreecommitdiff
path: root/distrib/i386
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-08-09 12:48:08 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-08-09 12:48:08 +0000
commitaad3432526eb97a7ec7f4afbff344df1bf37862f (patch)
tree7f7d381e3e70d5ea2dc012b6543cdb5ee54e6e4d /distrib/i386
parentb4979a0a033d4e6e83ae6fe078d2c80ab50d69a4 (diff)
do not install the cdromXX.fs file, it is useless
Diffstat (limited to 'distrib/i386')
-rw-r--r--distrib/i386/common/Makefile.inc4
-rw-r--r--distrib/i386/ramdisk_cd/Makefile3
2 files changed, 5 insertions, 2 deletions
diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc
index 1f9a38949ff..cdd55e818d1 100644
--- a/distrib/i386/common/Makefile.inc
+++ b/distrib/i386/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.19 2007/06/17 00:28:21 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.20 2007/08/09 12:48:07 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -99,7 +99,9 @@ install:
.ifndef NOBSDRD
cp bsd.rd ${DESTDIR}/snapshot/bsd.rd
.endif
+.ifndef NOFS
cp ${FS} ${DESTDIR}/snapshot/${FS}
+.endif
${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib \
diff --git a/distrib/i386/ramdisk_cd/Makefile b/distrib/i386/ramdisk_cd/Makefile
index 1afc385f8b8..16576c0dc05 100644
--- a/distrib/i386/ramdisk_cd/Makefile
+++ b/distrib/i386/ramdisk_cd/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2007/04/13 17:34:40 millert Exp $
+# $OpenBSD: Makefile,v 1.5 2007/08/09 12:48:07 deraadt Exp $
.PATH: ${.CURDIR}/../ramdisk
RAMDISK=RAMDISK_CD
FLOPPYSIZE=5760
FLOPPYTYPE=floppy288
XNAME=cdrom
+NOFS=1
.include "${.CURDIR}/../common/Makefile.inc"