2000-02-27 Eli Zaretskii <eliz@is.elta.co.il>

	* Makefile.am (stamp-lib): Use $(LIBTOOL) --config to get the
	name of the libtool directory.
	* Makefile.in: Rebuild.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 105dac8911b185ac4fff6c78a401714a12e1af54..fa1adf217376880e6e0e62d532332e7e1ab266f1 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-27  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * Makefile.am (stamp-lib): Use $(LIBTOOL) --config to get the
+       name of the libtool directory.
+       * Makefile.in: Rebuild.
+
 Fri Feb 25 18:39:26 2000  Rodney Brown (RodneyBrown@pmsc.com)
 
        * som.c (SOM_HOWTO): Define.

diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index f0144397a483508def11e2daa28e24a3f0352e3b..aaf5ff7caf3cc731a80dd1514d5d117bc3207625 100644 (file)
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -480,8 +480,9 @@ noinst_LIBRARIES = libbfd.a
 libbfd_a_SOURCES =
 
 stamp-lib: libbfd.la
-       if [ -f .libs/libbfd.a ]; then \
-         cp .libs/libbfd.a libbfd.tmp; \
+       libtooldir=`$(LIBTOOL) --config | sed -n -e 's/^objdir=//p'`; \
+       if [ -f $$libtooldir/libbfd.a ]; then \
+         cp $$libtooldir/libbfd.a libbfd.tmp; \
          $(SHELL) $(srcdir)/../move-if-change libbfd.tmp libbfd.a; \
        else true; fi
        touch stamp-lib

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 59aebe1e0f5414e34a336037790889e379cb2f5c..e77637d09c4af0b197379d1e1aafdbe0e818084a 100644 (file)
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -1023,8 +1023,9 @@ stamp-ofiles: Makefile
 ofiles: stamp-ofiles ; @true
 
 stamp-lib: libbfd.la
-       if [ -f .libs/libbfd.a ]; then \
-         cp .libs/libbfd.a libbfd.tmp; \
+       libtooldir=`$(LIBTOOL) --config | sed -n -e 's/^objdir=//p'`; \
+       if [ -f $$libtooldir/libbfd.a ]; then \
+         cp $$libtooldir/libbfd.a libbfd.tmp; \
          $(SHELL) $(srcdir)/../move-if-change libbfd.tmp libbfd.a; \
        else true; fi
        touch stamp-lib

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index a4355894171c43cecd3398cc2b4e65dffe4ced36..f2f9adbe52295e1639262a7daa78ffc9a429994f 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-27  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * Makefile.am (stamp-lib): Use $(LIBTOOL) --config to get the
+       name of the libtool directory.
+       * Makefile.in: Rebuild.
+
 2000-02-24  Nick Clifton  <nickc@cygnus.com>
 
        * cgen-opc.c (cgen_set_signed_overflow_ok): New function.

diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index 1ab8d797a592559244de7e0f2d44f058386946db..f4af1cac6fa44b5854d494dc4f3f105065784195 100644 (file)
--- a/opcodes/Makefile.am
+++ b/opcodes/Makefile.am
@@ -169,8 +169,9 @@ libopcodes_la_LDFLAGS = -release $(VERSION) @WIN32LDFLAGS@
 noinst_LIBRARIES = libopcodes.a
 
 stamp-lib: libopcodes.la
-       if [ -f .libs/libopcodes.a ]; then \
-         cp .libs/libopcodes.a libopcodes.tmp; \
+       libtooldir=`$(LIBTOOL) --config | sed -n -e 's/^objdir=//p'`; \
+       if [ -f $$libtooldir/libopcodes.a ]; then \
+         cp $$libtooldir/libopcodes.a libopcodes.tmp; \
          $(SHELL) $(srcdir)/../move-if-change libopcodes.tmp libopcodes.a; \
        else true; fi
        touch stamp-lib

diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
index 23d4178147c7cbe6b84c48fb59e042ec2888c5a8..b0f1ded162817f9d5d58aa18007ea09d4c3f3bc2 100644 (file)
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@@ -676,8 +676,9 @@ disassemble.lo: disassemble.c $(INCDIR)/dis-asm.h
        $(LIBTOOL) --mode=compile $(COMPILE) -c @archdefs@ $(srcdir)/disassemble.c
 
 stamp-lib: libopcodes.la
-       if [ -f .libs/libopcodes.a ]; then \
-         cp .libs/libopcodes.a libopcodes.tmp; \
+       libtooldir=`$(LIBTOOL) --config | sed -n -e 's/^objdir=//p'`; \
+       if [ -f $$libtooldir/libopcodes.a ]; then \
+         cp $$libtooldir/libopcodes.a libopcodes.tmp; \
          $(SHELL) $(srcdir)/../move-if-change libopcodes.tmp libopcodes.a; \
        else true; fi
        touch stamp-lib