diff options
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/Makefile.am | 5 | ||||
| -rw-r--r-- | bfd/Makefile.in | 5 | ||||
| -rw-r--r-- | opcodes/ChangeLog | 6 | ||||
| -rw-r--r-- | opcodes/Makefile.am | 5 | ||||
| -rw-r--r-- | opcodes/Makefile.in | 5 |
6 files changed, 24 insertions, 8 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 105dac8..fa1adf2 100644 --- 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 f014439..aaf5ff7 100644 --- 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 59aebe1..e77637d 100644 --- 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 a435589..f2f9adb 100644 --- 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 1ab8d79..f4af1ca 100644 --- 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 23d4178..b0f1ded 100644 --- 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 |