diff options
| author | joerg <joerg> | 2005-11-16 13:53:51 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2005-11-16 13:53:51 +0000 |
| commit | f108f99712cc4149fe438bf3580edb5fdadd23c3 (patch) | |
| tree | fe0abbe5c497f935b197ae57fa18fb274450a25c /bootstrap | |
| parent | 8131ffb7cb8fcc1d7311536b5db8d23432b0d00e (diff) | |
| download | pkgsrc-f108f99712cc4149fe438bf3580edb5fdadd23c3.tar.gz | |
sysMkPath should be ${PREFIX}/share/mk by default and only that.
Including e.g. /usr/share/mk results in sys.mk read from there
as well. On DragonFly this adds X11BASE and results in obscure
breakages. Since the mk files are supposed to be self-contained,
it doesn't make much sense to look in other directories anyway.
Bump revision to annotate this.
Discussed-with: reed@.
Reported-by: Aggelos Economopoulos <aoiko AT cc DOT ece DOT ntua DOT gr>
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap/bootstrap | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index af6f6ca7895..13d84932a43 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.44 2005/11/10 00:10:35 reed Exp $ +# $NetBSD: bootstrap,v 1.45 2005/11/16 13:53:51 joerg Exp $ # # # Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. @@ -659,7 +659,7 @@ fi echo_msg "Installing bmake" copy_src ../devel/bmake/files bmake -run_cmd "(cd $wrkdir/bmake && env CPPFLAGS='$CPPFLAGS -I../../libnbcompat' LDFLAGS='$LDFLAGS -L../../libnbcompat' LIBS='-lnbcompat' $shprog ./boot-strap -q -o $opsys --prefix=$prefix --sysconfdir=$sysconfdir --mksrc none --with-default-sys-path="$prefix/share/mk:/usr/share/mk:/usr/local/share/mk:/opt/share/mk")" +run_cmd "(cd $wrkdir/bmake && env CPPFLAGS='$CPPFLAGS -I../../libnbcompat' LDFLAGS='$LDFLAGS -L../../libnbcompat' LIBS='-lnbcompat' $shprog ./boot-strap -q -o $opsys --prefix=$prefix --sysconfdir=$sysconfdir --mksrc none --with-default-sys-path="$prefix/share/mk")" run_cmd "$shprog $wrkdir/install-sh -c -o $user -g $group -m 755 $wrkdir/bmake/$opsys/bmake $prefix/bin/bmake" #run_cmd "$shprog $wrkdir/install-sh -c -o $user -g $group -m 644 $wrkdir/bmake/$opsys/bmake.1 $prefix/man/man1/bmake.1" |