From 495e2e8eeb7dd9d2a6fe4b68fe641a2679998ab5 Mon Sep 17 00:00:00 2001 From: ian Date: Sun, 27 Feb 2000 17:08:06 +0000 Subject: [PATCH] 2000-02-27 Eli Zaretskii * Makefile.am (stamp-lib): Use $(LIBTOOL) --config to get the name of the libtool directory. * Makefile.in: Rebuild. --- opcodes/ChangeLog | 6 ++++++ opcodes/Makefile.am | 5 +++-- opcodes/Makefile.in | 5 +++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index a435589417..f2f9adbe52 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,9 @@ +2000-02-27 Eli Zaretskii + + * Makefile.am (stamp-lib): Use $(LIBTOOL) --config to get the + name of the libtool directory. + * Makefile.in: Rebuild. + 2000-02-24 Nick Clifton * cgen-opc.c (cgen_set_signed_overflow_ok): New function. diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index 1ab8d797a5..f4af1cac6f 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 23d4178147..b0f1ded162 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 -- 2.11.0