summaryrefslogtreecommitdiff
path: root/distrib/amd64/iso
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-08-10 12:29:56 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-08-10 12:29:56 +0000
commita85a94cd1e68da6ef66d261da53ff0ce7b9f4a8d (patch)
treedaf3c70aebe89fd0b0c4183df4e1bd3508307f37 /distrib/amd64/iso
parentc4e9352756d6701223ecbc7ea7bf7be97bcada75 (diff)
add missing xserv, and use ${MACHINE} throughout (still needs testing)
Diffstat (limited to 'distrib/amd64/iso')
-rw-r--r--distrib/amd64/iso/Makefile29
1 files changed, 15 insertions, 14 deletions
diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile
index ed8a08327f5..f27cd5e5353 100644
--- a/distrib/amd64/iso/Makefile
+++ b/distrib/amd64/iso/Makefile
@@ -1,41 +1,42 @@
-# $OpenBSD: Makefile,v 1.2 2007/08/10 03:02:38 deraadt Exp $
+# $OpenBSD: Makefile,v 1.3 2007/08/10 12:29:55 deraadt Exp $
TOP= ${.CURDIR}/..
.include "${TOP}/Makefile.inc"
CDROM= install${REV}.iso
-RELXDIR= /home/relx-amd64
-RELDIR?= /home/rel-amd64
+RELXDIR= /home/relx-${MACHINE}
+RELDIR?= /home/rel-${MACHINE}
BASE= ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
${RELDIR}/etc${OSrev}.tgz ${RELDIR}/game${OSrev}.tgz \
${RELDIR}/man${OSrev}.tgz ${RELDIR}/misc${OSrev}.tgz \
${RELDIR}/bsd ${RELDIR}/bsd.rd ${RELDIR}/bsd.mp \
- ${RELDIR}/INSTALL.amd64
+ ${RELDIR}/INSTALL.${MACHINE}
XBASE= ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \
- ${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz
+ ${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz \
+ ${RELXDIR}/xserv${OSrev}.tgz
all: ${CDROM}
${CDROM}: ${BASE} ${XBASE}
-rm -rf ${.OBJDIR}/cd-dir
- mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/amd64
+ mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
mkdir -p ${.OBJDIR}/cd-dir/etc
- echo "set image /${OSREV}/amd64/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
+ echo "set image /${OSREV}/${MACHINE}/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
- cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/amd64
- cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/amd64
+ cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+ cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
- cp -p ${RELDIR}/cdbr ${.OBJDIR}/cd-dir/${OSREV}/amd64
- cp -p ${RELDIR}/cdboot ${.OBJDIR}/cd-dir/${OSREV}/amd64/cdboot
+ cp -p ${RELDIR}/cdbr ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+ cp -p ${RELDIR}/cdboot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/cdboot
mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
- -A "OpenBSD ${OSREV} amd64 Install CD" \
+ -A "OpenBSD ${OSREV} ${MACHINE} Install CD" \
-P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
-p "Theo de Raadt <deraadt@openbsd.org>" \
- -V "OpenBSD/amd64 ${OSREV} Install CD" \
- -b ${OSREV}/amd64/cdbr -c ${OSREV}/amd64/boot.catalog \
+ -V "OpenBSD/${MACHINE} ${OSREV} Install CD" \
+ -b ${OSREV}/${MACHINE}/cdbr -c ${OSREV}/${MACHINE}/boot.catalog \
${.OBJDIR}/cd-dir
install: