summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-08-24 20:37:16 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-08-24 20:37:16 +0000
commitca2f1d294c5604ea53af0e9ae2cce22f57a0c873 (patch)
tree2ba77a000fb88da86d07759ca9c6f8a6324c91eb
parent1eb33890a7a16ab1c66802f4b5a564bbea85dd4c (diff)
move cdboot to ${OSREV}/${ARCH/
-rw-r--r--distrib/amd64/cdfs/Makefile4
-rw-r--r--distrib/i386/cdfs/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/distrib/amd64/cdfs/Makefile b/distrib/amd64/cdfs/Makefile
index 3c8582eda4d..1a3370fc014 100644
--- a/distrib/amd64/cdfs/Makefile
+++ b/distrib/amd64/cdfs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2004/08/23 14:30:21 deraadt Exp $
+# $OpenBSD: Makefile,v 1.4 2004/08/24 20:37:15 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -16,7 +16,7 @@ ${CDROM}:
echo "set image /${OSREV}/amd64/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
cp ${.OBJDIR}/../ramdisk_cd/${BSDRD} ${.OBJDIR}/cd-dir/${OSREV}/amd64
cp ${DESTDIR}/usr/mdec/cdbr ${.OBJDIR}/cd-dir/${OSREV}/amd64
- cp ${DESTDIR}/usr/mdec/cdboot ${.OBJDIR}/cd-dir/cdboot
+ cp ${DESTDIR}/usr/mdec/cdboot ${.OBJDIR}/cd-dir/${OSREV}/amd64/cdboot
mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
-A "OpenBSD ${OSREV} amd64 bootonly CD" \
-P "Copyright (c) 2004 Theo de Raadt, The OpenBSD project" \
diff --git a/distrib/i386/cdfs/Makefile b/distrib/i386/cdfs/Makefile
index e210aaeac22..2ca64d37365 100644
--- a/distrib/i386/cdfs/Makefile
+++ b/distrib/i386/cdfs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2004/08/11 06:51:13 deraadt Exp $
+# $OpenBSD: Makefile,v 1.6 2004/08/24 20:37:15 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -16,7 +16,7 @@ ${CDROM}:
echo "set image /${OSREV}/i386/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
cp ${.OBJDIR}/../ramdisk_cd/${BSDRD} ${.OBJDIR}/cd-dir/${OSREV}/i386
cp ${DESTDIR}/usr/mdec/cdbr ${.OBJDIR}/cd-dir/${OSREV}/i386
- cp ${DESTDIR}/usr/mdec/cdboot ${.OBJDIR}/cd-dir/cdboot
+ cp ${DESTDIR}/usr/mdec/cdboot ${.OBJDIR}/cd-dir/${OSREV}/i386/cdboot
mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
-A "OpenBSD ${OSREV} i386 bootonly CD" \
-P "Copyright (c) 2004 Theo de Raadt, The OpenBSD project" \