From 22220c01a001ba6b30f62d0ab0ca60d36cf0c757 Mon Sep 17 00:00:00 2001 From: deraadt Date: Mon, 25 Aug 2008 17:18:55 +0000 Subject: [PATCH] use ?= for adjusting RELXDIR for all sets --- distrib/alpha/iso/Makefile | 4 ++-- distrib/amd64/iso/Makefile | 4 ++-- distrib/hppa/iso/Makefile | 4 ++-- distrib/i386/iso/Makefile | 4 ++-- distrib/macppc/iso/Makefile | 4 ++-- distrib/sparc/iso/Makefile | 4 ++-- distrib/sparc64/iso/Makefile | 4 ++-- distrib/vax/iso/Makefile | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/distrib/alpha/iso/Makefile b/distrib/alpha/iso/Makefile index a5ceb403ab3..e8b1c13d6a4 100644 --- a/distrib/alpha/iso/Makefile +++ b/distrib/alpha/iso/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.4 2008/03/05 21:28:36 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2008/08/25 17:18:55 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" CDROM= install${OSrev}.iso -RELXDIR= /home/relx-${MACHINE} +RELXDIR?= /home/relx-${MACHINE} RELDIR?= /home/rel-${MACHINE} BASE= ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \ diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile index f27cd5e5353..9502ee8c41c 100644 --- a/distrib/amd64/iso/Makefile +++ b/distrib/amd64/iso/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.3 2007/08/10 12:29:55 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2008/08/25 17:18:55 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" CDROM= install${REV}.iso -RELXDIR= /home/relx-${MACHINE} +RELXDIR?= /home/relx-${MACHINE} RELDIR?= /home/rel-${MACHINE} BASE= ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \ diff --git a/distrib/hppa/iso/Makefile b/distrib/hppa/iso/Makefile index c7b22e216ca..262f78fd99c 100644 --- a/distrib/hppa/iso/Makefile +++ b/distrib/hppa/iso/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.3 2007/08/10 12:29:55 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2008/08/25 17:18:55 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" CDROM= install${REV}.iso -RELXDIR= /home/relx-${MACHINE} +RELXDIR?= /home/relx-${MACHINE} RELDIR?= /home/rel-${MACHINE} BASE= ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \ diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile index 5c7c391f59c..fca84d0018e 100644 --- a/distrib/i386/iso/Makefile +++ b/distrib/i386/iso/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.3 2007/08/10 12:29:55 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2008/08/25 17:18:55 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" CDROM= install${REV}.iso -RELXDIR= /home/relx-${MACHINE} +RELXDIR?= /home/relx-${MACHINE} RELDIR?= /home/rel-${MACHINE} BASE= ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \ diff --git a/distrib/macppc/iso/Makefile b/distrib/macppc/iso/Makefile index 88a641a54a1..7991ba790e0 100644 --- a/distrib/macppc/iso/Makefile +++ b/distrib/macppc/iso/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.4 2007/08/10 12:29:55 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2008/08/25 17:18:55 deraadt Exp $ TOP= ${.CURDIR}/.. #.include "${TOP}/Makefile.inc" CDROM= install${OSrev}.iso -RELXDIR= /home/relx-${MACHINE} +RELXDIR?= /home/relx-${MACHINE} RELDIR?= /home/rel-${MACHINE} BASE= ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \ diff --git a/distrib/sparc/iso/Makefile b/distrib/sparc/iso/Makefile index c9ef418169b..04a2343ae05 100644 --- a/distrib/sparc/iso/Makefile +++ b/distrib/sparc/iso/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.3 2007/08/10 12:29:55 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2008/08/25 17:18:55 deraadt Exp $ TOP= ${.CURDIR}/.. #.include "${TOP}/Makefile.inc" CDROM= install${OSrev}.iso -RELXDIR= /home/relx-${MACHINE} +RELXDIR?= /home/relx-${MACHINE} RELDIR?= /home/rel-${MACHINE} BASE= ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \ diff --git a/distrib/sparc64/iso/Makefile b/distrib/sparc64/iso/Makefile index 7e1b8d0a248..4d79b46acc2 100644 --- a/distrib/sparc64/iso/Makefile +++ b/distrib/sparc64/iso/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.5 2008/03/04 05:37:51 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2008/08/25 17:18:55 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" CDROM= install${REV}.iso -RELXDIR= /home/relx-${MACHINE} +RELXDIR?= /home/relx-${MACHINE} RELDIR?= /home/rel-${MACHINE} BASE= ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \ diff --git a/distrib/vax/iso/Makefile b/distrib/vax/iso/Makefile index 508bf5391ae..5e753602295 100644 --- a/distrib/vax/iso/Makefile +++ b/distrib/vax/iso/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.2 2008/02/24 19:32:48 deraadt Exp $ +# $OpenBSD: Makefile,v 1.3 2008/08/25 17:18:55 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" CDROM= install${REV}.iso -RELXDIR= /home/relx-${MACHINE} +RELXDIR?= /home/relx-${MACHINE} RELDIR?= /home/rel-${MACHINE} BASE= ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \ -- 2.20.1