summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
Diffstat (limited to 'distrib')
-rw-r--r--distrib/amd64/common/Makefile.inc4
-rw-r--r--distrib/amd64/ramdisk_cd/Makefile3
-rw-r--r--distrib/i386/common/Makefile.inc4
-rw-r--r--distrib/i386/ramdisk_cd/Makefile3
4 files changed, 10 insertions, 4 deletions
diff --git a/distrib/amd64/common/Makefile.inc b/distrib/amd64/common/Makefile.inc
index 8ba69c08e42..907d03c33e0 100644
--- a/distrib/amd64/common/Makefile.inc
+++ b/distrib/amd64/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.9 2007/07/27 13:39:00 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.10 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/amd64/ramdisk_cd/Makefile b/distrib/amd64/ramdisk_cd/Makefile
index 63b502987ba..98743ed4d02 100644
--- a/distrib/amd64/ramdisk_cd/Makefile
+++ b/distrib/amd64/ramdisk_cd/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2007/05/19 15:52:31 millert Exp $
+# $OpenBSD: Makefile,v 1.3 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"
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"