src - OpenBSD base system

diff options


context:
space:
mode:

author	Theo de Raadt <deraadt@cvs.openbsd.org>	2007-08-10 03:02:39 +0000
committer	Theo de Raadt <deraadt@cvs.openbsd.org>	2007-08-10 03:02:39 +0000
commit	0107065671af49d33260929557a46d1053b82765 (patch)
tree	6b590b70c84d9bd5f1f62f3bd5b25abd9bf3aab7
parent	e22d87ff3e8c6406d9145f53efff7a71d01cf79f (diff)

use more variables, because variables are good

Diffstat

-rw-r--r--

distrib/alpha/iso/Makefile

-rw-r--r--

distrib/amd64/iso/Makefile

-rw-r--r--

distrib/hppa/iso/Makefile

-rw-r--r--

distrib/i386/iso/Makefile

-rw-r--r--

distrib/macppc/iso/Makefile

-rw-r--r--

distrib/sparc/iso/Makefile

-rw-r--r--

distrib/sparc64/iso/Makefile

7 files changed, 91 insertions, 70 deletions

diff --git a/distrib/alpha/iso/Makefile b/distrib/alpha/iso/Makefile
index 7a9e51c5131..3c0159df501 100644
--- a/distrib/alpha/iso/Makefile
+++ b/distrib/alpha/iso/Makefile

@@ -1,4 +1,4 @@

-# $OpenBSD: Makefile,v 1.1 2007/08/10 02:28:51 deraadt Exp $

+# $OpenBSD: Makefile,v 1.2 2007/08/10 03:02:38 deraadt Exp $

TOP= ${.CURDIR}/..

@@ -7,20 +7,23 @@ TOP= ${.CURDIR}/..

CDROM= install${OSrev}.iso

RELXDIR= /home/relx-alpha

RELDIR?= /home/rel-alpha

+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}/INSTALL.alpha

+XBASE= ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \

+ ${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz

all: ${CDROM}

-${CDROM}:

+${CDROM}: ${BASE} ${XBASE}

-rm -rf ${.OBJDIR}/cd-dir

mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/alpha

- cp -p ${RELDIR}/{base,comp,etc,game,man,misc}${OSrev}.tgz \

- ${.OBJDIR}/cd-dir/${OSREV}/alpha

- cp -p ${RELDIR}/{bsd,bsd.rd} \

- ${.OBJDIR}/cd-dir/${OSREV}/alpha

- cp -p ${RELXDIR}/{xbase,xetc,xfont,xserv,xshare}${OSrev}.tgz \

- ${.OBJDIR}/cd-dir/${OSREV}/alpha

- cp -p ${RELDIR}/INSTALL.alpha \

- ${.OBJDIR}/cd-dir/${OSREV}/alpha

+ cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/alpha

+ cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/alpha

cp -p ${RELDIR}/boot ${.OBJDIR}/cd-dir/${OSREV}/alpha

cp -p ${RELDIR}/bootxx ${.OBJDIR}/cd-dir/${OSREV}/alpha

diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile
index f7553b962eb..ed8a08327f5 100644
--- a/distrib/amd64/iso/Makefile
+++ b/distrib/amd64/iso/Makefile

@@ -1,4 +1,4 @@

-# $OpenBSD: Makefile,v 1.1 2007/08/10 02:28:53 deraadt Exp $

+# $OpenBSD: Makefile,v 1.2 2007/08/10 03:02:38 deraadt Exp $

TOP= ${.CURDIR}/..

@@ -7,22 +7,25 @@ TOP= ${.CURDIR}/..

CDROM= install${REV}.iso

RELXDIR= /home/relx-amd64

RELDIR?= /home/rel-amd64

+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

+XBASE= ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \

+ ${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz

all: ${CDROM}

-${CDROM}:

+${CDROM}: ${BASE} ${XBASE}

-rm -rf ${.OBJDIR}/cd-dir

mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/amd64

mkdir -p ${.OBJDIR}/cd-dir/etc

echo "set image /${OSREV}/amd64/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf

- cp -p ${RELDIR}/{base,comp,etc,game,man,misc}${OSrev}.tgz \

- ${.OBJDIR}/cd-dir/${OSREV}/amd64

- cp -p ${RELDIR}/{bsd,bsd.rd,bsd.mp} \

- ${.OBJDIR}/cd-dir/${OSREV}/amd64

- cp -p ${RELXDIR}/{xbase,xetc,xfont,xserv,xshare}${OSrev}.tgz \

- ${.OBJDIR}/cd-dir/${OSREV}/amd64

- cp -p ${RELDIR}/INSTALL.amd64 \

- ${.OBJDIR}/cd-dir/${OSREV}/amd64

+ cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/amd64

+ cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/amd64

cp -p ${RELDIR}/cdbr ${.OBJDIR}/cd-dir/${OSREV}/amd64

cp -p ${RELDIR}/cdboot ${.OBJDIR}/cd-dir/${OSREV}/amd64/cdboot

diff --git a/distrib/hppa/iso/Makefile b/distrib/hppa/iso/Makefile
index abccd3a7f82..69ee5e67b94 100644
--- a/distrib/hppa/iso/Makefile
+++ b/distrib/hppa/iso/Makefile

@@ -1,4 +1,4 @@

-# $OpenBSD: Makefile,v 1.1 2007/08/10 02:28:53 deraadt Exp $

+# $OpenBSD: Makefile,v 1.2 2007/08/10 03:02:38 deraadt Exp $

TOP= ${.CURDIR}/..

@@ -7,20 +7,23 @@ TOP= ${.CURDIR}/..

CDROM= install${REV}.iso

RELXDIR= /home/relx-hppa

RELDIR?= /home/rel-hppa

+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}/INSTALL.hppa

+XBASE= ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \

+ ${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz

all: ${CDROM}

-${CDROM}:

+${CDROM}: ${BASE} ${XBASE}

-rm -rf ${.OBJDIR}/cd-dir

mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/hppa

- cp -p ${RELDIR}/{base,comp,etc,game,man,misc}${OSrev}.tgz \

- ${.OBJDIR}/cd-dir/${OSREV}/hppa

- cp -p ${RELDIR}/{bsd,bsd.rd} \

- ${.OBJDIR}/cd-dir/${OSREV}/hppa

- cp -p ${RELXDIR}/{xbase,xetc,xfont,xserv,xshare}${OSrev}.tgz \

- ${.OBJDIR}/cd-dir/${OSREV}/hppa

- cp -p ${RELDIR}/INSTALL.hppa \

- ${.OBJDIR}/cd-dir/${OSREV}/hppa

+ cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/hppa

+ cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/hppa

ln -f ${.OBJDIR}/cd-dir/${OSREV}/hppa/bsd.rd \

${.OBJDIR}/cd-dir/bsd.rd

diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile
index 7f79859c3d7..48019f210f5 100644
--- a/distrib/i386/iso/Makefile
+++ b/distrib/i386/iso/Makefile

@@ -1,4 +1,4 @@

-# $OpenBSD: Makefile,v 1.1 2007/08/10 02:28:53 deraadt Exp $

+# $OpenBSD: Makefile,v 1.2 2007/08/10 03:02:38 deraadt Exp $

TOP= ${.CURDIR}/..

@@ -7,22 +7,25 @@ TOP= ${.CURDIR}/..

CDROM= install${REV}.iso

RELXDIR= /home/relx-i386

RELDIR?= /home/rel-i386

+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.i386

+XBASE= ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \

+ ${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz

all: ${CDROM}

-${CDROM}:

+${CDROM}: ${BASE} ${XBASE}

-rm -rf ${.OBJDIR}/cd-dir

mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/i386

mkdir -p ${.OBJDIR}/cd-dir/etc

echo "set image /${OSREV}/i386/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf

- cp -p ${RELDIR}/{base,comp,etc,game,man,misc}${OSrev}.tgz \

- ${.OBJDIR}/cd-dir/${OSREV}/i386

- cp -p ${RELDIR}/{bsd,bsd.rd,bsd.mp} \

- ${.OBJDIR}/cd-dir/${OSREV}/i386

- cp -p ${RELXDIR}/{xbase,xetc,xfont,xserv,xshare}${OSrev}.tgz \

- ${.OBJDIR}/cd-dir/${OSREV}/i386

- cp -p ${RELDIR}/INSTALL.i386 \

- ${.OBJDIR}/cd-dir/${OSREV}/i386

+ cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/i386

+ cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/i386

cp -p ${RELDIR}/cdbr ${.OBJDIR}/cd-dir/${OSREV}/i386

cp -p ${RELDIR}/cdboot ${.OBJDIR}/cd-dir/${OSREV}/i386/cdboot

diff --git a/distrib/macppc/iso/Makefile b/distrib/macppc/iso/Makefile
index c20bfb1ab3a..feac2b4fa21 100644
--- a/distrib/macppc/iso/Makefile
+++ b/distrib/macppc/iso/Makefile

@@ -1,4 +1,4 @@

-# $OpenBSD: Makefile,v 1.2 2007/08/10 02:45:07 deraadt Exp $

+# $OpenBSD: Makefile,v 1.3 2007/08/10 03:02:38 deraadt Exp $

TOP= ${.CURDIR}/..

@@ -7,20 +7,23 @@ TOP= ${.CURDIR}/..

CDROM= install${OSrev}.iso

RELXDIR= /home/relx-macppc

RELDIR?= /home/rel-macppc

+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}/INSTALL.macppc

+XBASE= ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \

+ ${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz

all: ${CDROM}

-${CDROM}:

+${CDROM}: ${BASE} ${XBASE}

-rm -rf ${.OBJDIR}/cd-dir/

-@mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/macppc/

- cp -p ${RELDIR}/{base,comp,etc,game,man,misc}${OSrev}.tgz \

- ${.OBJDIR}/cd-dir/${OSREV}/macppc

- cp -p ${RELDIR}/{bsd,bsd.rd} \

- ${.OBJDIR}/cd-dir/${OSREV}/macppc

- cp -p ${RELXDIR}/{xbase,xetc,xfont,xserv,xshare}${OSrev}.tgz \

- ${.OBJDIR}/cd-dir/${OSREV}/macppc

- cp -p ${RELDIR}/INSTALL.macppc \

- ${.OBJDIR}/cd-dir/${OSREV}/macppc

+ cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/macppc

+ cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/macppc

cp -p ${.CURDIR}/../../../sys/arch/macppc/stand/tbxidata/bsd.tbxi \

${.OBJDIR}/cd-dir/${OSREV}/macppc

diff --git a/distrib/sparc/iso/Makefile b/distrib/sparc/iso/Makefile
index 6fee202d665..ee532336cdf 100644
--- a/distrib/sparc/iso/Makefile
+++ b/distrib/sparc/iso/Makefile

@@ -1,4 +1,4 @@

-# $OpenBSD: Makefile,v 1.1 2007/08/10 02:28:53 deraadt Exp $

+# $OpenBSD: Makefile,v 1.2 2007/08/10 03:02:38 deraadt Exp $

TOP= ${.CURDIR}/..

@@ -7,20 +7,23 @@ TOP= ${.CURDIR}/..

CDROM= install${OSrev}.iso

RELXDIR= /home/relx-sparc

RELDIR?= /home/rel-sparc

+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}/INSTALL.sparc

+XBASE= ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \

+ ${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz

all: ${CDROM}

-${CDROM}:

+${CDROM}: ${BASE} ${XBASE}

-rm -rf ${.OBJDIR}/cd-dir

mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/sparc

- cp -p ${RELDIR}/{base,comp,etc,game,man,misc}${OSrev}.tgz \

- ${.OBJDIR}/cd-dir/${OSREV}/sparc

- cp -p ${RELDIR}/{bsd,bsd.rd} \

- ${.OBJDIR}/cd-dir/${OSREV}/sparc

- cp -p ${RELXDIR}/{xbase,xetc,xfont,xserv,xshare}${OSrev}.tgz \

- ${.OBJDIR}/cd-dir/${OSREV}/sparc

- cp -p ${RELDIR}/INSTALL.sparc \

- ${.OBJDIR}/cd-dir/${OSREV}/sparc

+ cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/sparc

+ cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/sparc

ln -f ${.OBJDIR}/cd-dir/${OSREV}/sparc/bsd.rd ${.OBJDIR}/cd-dir/bsd.rd

ln -f ${.OBJDIR}/cd-dir/bsd.rd ${.OBJDIR}/cd-dir/bsd

diff --git a/distrib/sparc64/iso/Makefile b/distrib/sparc64/iso/Makefile
index 737835cfd3e..407d9f0c4c2 100644
--- a/distrib/sparc64/iso/Makefile
+++ b/distrib/sparc64/iso/Makefile

@@ -1,4 +1,4 @@

-# $OpenBSD: Makefile,v 1.1 2007/08/10 02:28:53 deraadt Exp $

+# $OpenBSD: Makefile,v 1.2 2007/08/10 03:02:38 deraadt Exp $

TOP= ${.CURDIR}/..

@@ -7,20 +7,23 @@ TOP= ${.CURDIR}/..

CDROM= install${REV}.iso

RELXDIR= /home/relx-sparc64

RELDIR?= /home/rel-sparc64

+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}/INSTALL.sparc64

+XBASE= ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \

+ ${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz

all: ${CDROM}

-${CDROM}:

+${CDROM}: ${BASE} ${XBASE}

-rm -rf ${.OBJDIR}/cd-dir

-mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/sparc64

- cp -p ${RELDIR}/{base,comp,etc,game,man,misc}${OSrev}.tgz \

- ${.OBJDIR}/cd-dir/${OSREV}/sparc64

- cp -p ${RELDIR}/{bsd,bsd.rd} \

- ${.OBJDIR}/cd-dir/${OSREV}/sparc64

- cp -p ${RELXDIR}/{xbase,xetc,xfont,xserv,xshare}${OSrev}.tgz \

- ${.OBJDIR}/cd-dir/${OSREV}/sparc64

- cp -p ${RELDIR}/INSTALL.sparc64 \

- ${.OBJDIR}/cd-dir/${OSREV}/sparc64

+ cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/sparc64

+ cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/sparc64

cp -p ${RELDIR}/ofwboot ${.OBJDIR}/cd-dir/${OSREV}/sparc64