diff options
| author | tv <tv@pkgsrc.org> | 2005-03-08 15:43:10 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-03-08 15:43:10 +0000 |
| commit | f7bdf70504f351f36f3dd8351732d8844a3bf55a (patch) | |
| tree | e490d9d8353d6e79bac2675858c5bd422e6d3b49 | |
| parent | a933a4306cbd56265d8020eacc76ce17c4f99508 (diff) | |
| download | pkgsrc-f7bdf70504f351f36f3dd8351732d8844a3bf55a.tar.gz | |
Were the overrides in mods/mk ever tested?
Fix the override logic for $opsys.bsd.{lib,man}.mk to install the files
in the correct place -- this was previously all kinds of b0rken. Now it's
possible to build shlibs properly on Interix using <bsd.lib.mk>, and may
be possible on Darwin as well.
| -rwxr-xr-x | bootstrap/bootstrap | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index fe75c1e22a2..32ea30be397 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.31 2005/02/19 04:07:31 grant Exp $ +# $NetBSD: bootstrap,v 1.32 2005/03/08 15:43:10 tv Exp $ # # # Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. @@ -533,13 +533,12 @@ copy_src bmake bmake run_cmd "$cpprog bsd.*.mk $prefix/share/mk") if [ -f mods/mk/$opsys.bsd.lib.mk ] ; then - run_cmd "$cpprog ${wrkdir}/bmake/mk/bsd.lib.mk ${wrkdir}/bmake/mk/bsd.lib.mk.orig" run_cmd "$cpprog mods/mk/$opsys.bsd.lib.mk ${wrkdir}/bmake/mk/bsd.lib.mk" + run_cmd "$cpprog mods/mk/$opsys.bsd.lib.mk $prefix/share/mk/bsd.lib.mk" fi -run_cmd "$cpprog ${wrkdir}/bmake/mk/bsd.man.mk ${wrkdir}/bsd.man.mk.orig" if [ -f mods/mk/$opsys.bsd.man.mk ] ; then - run_cmd "$cpprog mods/mk/$opsys.bsd.man.mk ${wrkdir}/bsd.man.mk" + run_cmd "$cpprog mods/mk/$opsys.bsd.man.mk ${wrkdir}/bmake/mk/bsd.man.mk" run_cmd "$cpprog mods/mk/$opsys.bsd.man.mk $prefix/share/mk/bsd.man.mk" fi |