Skip to content

Commit

Permalink
Add back $pkg_install_args when invoking the pkg_install configure
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
johnnylam88 committed Jul 21, 2006
1 parent 5cfb780 commit 80e73a2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions bootstrap/bootstrap
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -35,7 +35,7 @@
#
#set -x

BOOTSTRAP_VERSION=20060714
BOOTSTRAP_VERSION=20060721

ignorecasecheck=no
ignoreusercheck=no
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 80e73a2

Please sign in to comment.