pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/bootstrap Were the overrides in mods/mk ever tested?



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a2c9baf373dc
branches:  trunk
changeset: 490393:a2c9baf373dc
user:      tv <tv%pkgsrc.org@localhost>
date:      Tue Mar 08 15:43:10 2005 +0000

description:
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.

diffstat:

 bootstrap/bootstrap |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r ebac6cf62d3d -r a2c9baf373dc bootstrap/bootstrap
--- a/bootstrap/bootstrap       Tue Mar 08 14:20:39 2005 +0000
+++ b/bootstrap/bootstrap       Tue Mar 08 15:43:10 2005 +0000
@@ -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 @@
        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
 



Home | Main Index | Thread Index | Old Index