summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorjlam <jlam>2006-07-21 16:31:49 +0000
committerjlam <jlam>2006-07-21 16:31:49 +0000
commita5195344157e93a05f4a1fa4311342d4ab0e99ce (patch)
treef7de7460bbeea9b2bd5649df64b8066290b14a69 /bootstrap
parent97fe2712320593b8f48fb2c5ff8a5813c5866259 (diff)
downloadpkgsrc-a5195344157e93a05f4a1fa4311342d4ab0e99ce.tar.gz
Add back $pkg_install_args when invoking the pkg_install configure
script. It was lost in revision 1.55. This fixes the path to the various pax, mtree, ftp commands used by pkg_install. Bump the version number of the bootstrap script.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap/bootstrap6
1 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index efe7b8e345e..ef4469e3508 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: bootstrap,v 1.73 2006/07/21 15:30:30 jlam Exp $
+# $NetBSD: bootstrap,v 1.74 2006/07/21 16:31:49 jlam Exp $
#
#
# Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved.
@@ -35,7 +35,7 @@
#
#set -x
-BOOTSTRAP_VERSION=20060714
+BOOTSTRAP_VERSION=20060721
ignorecasecheck=no
ignoreusercheck=no
@@ -804,7 +804,7 @@ esac
# bootstrap pkg_install
echo_msg "Installing pkgtools"
copy_src ../pkgtools/pkg_install/files pkg_install
-run_cmd "(cd $wrkdir/pkg_install; env $BSTRAP_ENV CPPFLAGS='$CPPFLAGS -I../libnbcompat -I../../libnbcompat' LDFLAGS='$LDFLAGS -L../libnbcompat -L../../libnbcompat' LIBS='-lnbcompat' $shprog ./configure -C --prefix=$prefix --sysconfdir=$sysconfdir --with-pkgdbdir=$pkgdbdir --mandir=$mandir && $bmake && $bmake install)"
+run_cmd "(cd $wrkdir/pkg_install; env $BSTRAP_ENV CPPFLAGS='$CPPFLAGS -I../libnbcompat -I../../libnbcompat' LDFLAGS='$LDFLAGS -L../libnbcompat -L../../libnbcompat' LIBS='-lnbcompat' $shprog ./configure -C --prefix=$prefix --sysconfdir=$sysconfdir --with-pkgdbdir=$pkgdbdir --mandir=$mandir $pkg_install_args && $bmake && $bmake install)"
# opsys specific fiddling
opsys_finish