diff options
| author | obache <obache@pkgsrc.org> | 2010-11-20 00:49:33 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2010-11-20 00:49:33 +0000 |
| commit | dbd88dfc84bb69f056511b2744f624aac66d016a (patch) | |
| tree | baf522021638ce4df6ff3a9b60ffa82bc9146372 /bootstrap | |
| parent | 7fc5b201b51de1d2d5ba9122676d5b807dc47ee9 (diff) | |
| download | pkgsrc-dbd88dfc84bb69f056511b2744f624aac66d016a.tar.gz | |
Revert r1.159, adding WRKOBJDIR to mk.conf from --workdir.
PR#44117.
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap/bootstrap | 10 |
1 files changed, 3 insertions, 7 deletions
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} |