[src/trunk]: src/tools/binutils move libaries back to gnu/lib

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/069794e99da9
branches:  trunk
changeset: 555917:069794e99da9
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Dec 04 14:38:00 2003 +0000

description:
move libaries back to gnu/lib

diffstat:

 tools/binutils/Makefile          |   6 +++---
 tools/binutils/mknative-binutils |  30 +++++++++++++++---------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diffs (102 lines):

diff -r 7718794e96d1 -r 069794e99da9 tools/binutils/Makefile
--- a/tools/binutils/Makefile   Thu Dec 04 13:57:30 2003 +0000
+++ b/tools/binutils/Makefile   Thu Dec 04 14:38:00 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2003/12/04 09:29:36 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2003/12/04 14:38:00 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -21,7 +21,7 @@
 
 native-binutils: .native/.configure_done
        @echo 'Extracting GNU binutils configury for a native toolchain.'
-       @MAKE=${MAKE:Q} ${HOST_SH} ${MKNATIVE} binutils \
+       MAKE=${MAKE:Q} ${HOST_SH} ${MKNATIVE} binutils \
                ${.OBJDIR}/.native ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM}
 
 .native/.configure_done: ${_GNU_CFGSRC} ${.CURDIR}/Makefile
@@ -39,7 +39,7 @@
                        ac_cv_prog_cc_cross=yes \
                        ac_cv_func_strcoll_works=yes \
                        ${HOST_SH} ${GNUHOSTDIST}/configure \
-                       --build=`${.CURDIR}/../../gnu/dist/toolchain/config.guess` \
+                       --build=`${GNUHOSTDIST}/config.guess` \
                        --host=${MACHINE_GNU_PLATFORM} \
                        --target=${MACHINE_GNU_PLATFORM}) && \
                (cd .native && ${MAKE} configure-host) && \
diff -r 7718794e96d1 -r 069794e99da9 tools/binutils/mknative-binutils
--- a/tools/binutils/mknative-binutils  Thu Dec 04 13:57:30 2003 +0000
+++ b/tools/binutils/mknative-binutils  Thu Dec 04 14:38:00 2003 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: mknative-binutils,v 1.2 2003/11/27 10:52:53 mrg Exp $
+#      $NetBSD: mknative-binutils,v 1.3 2003/12/04 14:38:00 mrg Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of src/gnu/dist/binutils.
@@ -14,50 +14,50 @@
 
 . $_TOP/tools/gcc/mknative.common
 
-##### gnu/usr.bin/binutils/libbfd #####
+##### gnu/lib/libbfd #####
 
 get_libbfd () {
-       mkdir -p $_TOP/gnu/usr.bin/binutils/libbfd/arch/$MACHINE_ARCH
+       mkdir -p $_TOP/gnu/lib/libbfd/arch/$MACHINE_ARCH
 
        {
                getvars bfd/Makefile \
                        libbfd_la_DEPENDENCIES libbfd_la_OBJECTS DEFS \
                        INCLUDES TDEFAULTS
-       } | write_mk gnu/usr.bin/binutils/libbfd/arch/$MACHINE_ARCH/defs.mk
+       } | write_mk gnu/lib/libbfd/arch/$MACHINE_ARCH/defs.mk
 
-       write_c gnu/usr.bin/binutils/libbfd/arch/$MACHINE_ARCH/bfd.h <$_TMPDIR/bfd/bfd.h
-       write_c gnu/usr.bin/binutils/libbfd/arch/$MACHINE_ARCH/bfdver.h <$_TMPDIR/bfd/bfdver.h
+       write_c gnu/lib/libbfd/arch/$MACHINE_ARCH/bfd.h <$_TMPDIR/bfd/bfd.h
+       write_c gnu/lib/libbfd/arch/$MACHINE_ARCH/bfdver.h <$_TMPDIR/bfd/bfdver.h
 
        {
                cat $_TMPDIR/bfd/config.h
-       } | write_c gnu/usr.bin/binutils/libbfd/arch/$MACHINE_ARCH/config.h
+       } | write_c gnu/lib/libbfd/arch/$MACHINE_ARCH/config.h
 }
 
-##### gnu/usr.bin/binutils/libopcodes #####
+##### gnu/lib/libopcodes #####
 
 get_libopcodes () {
-       mkdir -p $_TOP/gnu/usr.bin/binutils/libopcodes/arch/$MACHINE_ARCH
+       mkdir -p $_TOP/gnu/lib/libopcodes/arch/$MACHINE_ARCH
 
        {
                getvars opcodes/Makefile \
                        archdefs BFD_MACHINES libopcodes_la_SOURCES
-       } | write_mk gnu/usr.bin/binutils/libopcodes/arch/$MACHINE_ARCH/defs.mk
+       } | write_mk gnu/lib/libopcodes/arch/$MACHINE_ARCH/defs.mk
 
        {
                cat $_TMPDIR/opcodes/config.h
-       } | write_c gnu/usr.bin/binutils/libopcodes/arch/$MACHINE_ARCH/config.h
+       } | write_c gnu/lib/libopcodes/arch/$MACHINE_ARCH/config.h
 }
 
-##### gnu/usr.bin/binutils/libiberty #####
+##### gnu/lib/libiberty #####
 
 get_libiberty () {
-       mkdir -p $_TOP/gnu/usr.bin/binutils/libiberty
+       mkdir -p $_TOP/gnu/lib/libiberty
 
        getvars libiberty/Makefile \
                ALLOCA EXTRA_OFILES LIBOBJS REQUIRED_OFILES \
-               | write_mk gnu/usr.bin/binutils/libiberty/defs.mk
+               | write_mk gnu/lib/libiberty/defs.mk
 
-       write_c gnu/usr.bin/binutils/libiberty/config.h \
+       write_c gnu/lib/libiberty/config.h \
                <$_TMPDIR/libiberty/config.h
 }