From dbd88dfc84bb69f056511b2744f624aac66d016a Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
Date: Sat, 20 Nov 2010 00:49:33 +0000
Subject: Revert r1.159, adding WRKOBJDIR to mk.conf from --workdir. PR#44117.

---
 bootstrap/bootstrap | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'bootstrap')

diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index 39cb9d3b735..2983dc1d886 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.160 2010/11/13 21:43:39 joerg Exp $
+# $NetBSD: bootstrap,v 1.161 2010/11/20 00:49:33 obache Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -371,7 +371,6 @@ pkgdbdir=
 pkgmandir=
 sysconfdir=
 varbase=
-workdir=
 
 full=no
 compiler=""
@@ -380,8 +379,8 @@ mk_fragment=
 
 while [ $# -gt 0 ]; do
 	case $1 in
-	--workdir=*)	wrkdir=`get_optarg "$1"`; workdir=${wrkdir} ;;
-	--workdir)	wrkdir="$2"; shift; workdir=${wrkdir} ;;
+	--workdir=*)	wrkdir=`get_optarg "$1"` ;;
+	--workdir)	wrkdir="$2"; shift ;;
 	--prefix=*)	prefix=`get_optarg "$1"` ;;
 	--prefix)	prefix="$2"; shift ;;
 	--pkgdbdir=*)	pkgdbdir=`get_optarg "$1"` ;;
@@ -1064,9 +1063,6 @@ fi
 opsys_finish
 
 echo "WRKOBJDIR=		${wrkdir}/wrk" >> ${BOOTSTRAP_MKCONF}
-if [ ! -z "${workdir}" ]; then
-	echo "WRKOBJDIR=		${workdir}/pkgsrc" >> ${TARGET_MKCONF}
-fi
 
 echo "" >> ${TARGET_MKCONF}
 echo "" >> ${BOOTSTRAP_MKCONF}
-- 
cgit v1.2.3