Makefile.in: $(MULTISUBDIR) has an implied leading `/'; remove duplicates.

2002-01-20  Toon Moene  <toon@moene.indiv.nluug.nl>

	* Makefile.in: $(MULTISUBDIR) has an implied leading `/';
	remove duplicates.
	Use libtool for removing libg2c{a|la|so} for the `uninstall' target.

From-SVN: r49021

diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog
index 9be80dde6a6d6542c21de8b530f118f6ed503501..a576b85caddf5ae02025b871ff39a8e3dace9e46 100644 (file)
--- a/libf2c/ChangeLog
+++ b/libf2c/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-20  Toon Moene  <toon@moene.indiv.nluug.nl>
+
+       * Makefile.in: $(MULTISUBDIR) has an implied leading `/';
+       remove duplicates.
+       Use libtool for removing libg2c{a|la|so} for the `uninstall' target.
+
 2002-01-18  Toon Moene  <toon@moene.indiv.nluug.nl>
 
        * Makefile.in: Add missing `/' separator in last change.

diff --git a/libf2c/Makefile.in b/libf2c/Makefile.in
index ba268d15dc25005e4a2822a22a86ff8d78cd44bd..c58703c1e565c9a989dbba08c30c3c51bf825a14 100644 (file)
--- a/libf2c/Makefile.in
+++ b/libf2c/Makefile.in
@@ -142,7 +142,7 @@ i77 f77 u77: g2c.h
 $(LIBG2C): s-libi77 s-libf77 s-libu77 s-libe77
        $(LIBTOOL) --mode=link $(CC) -o $@ \
          -version-info $(VERSION_MAJOR):$(VERSION_MINOR):$(VERSION_SUB) \
-         -rpath $(libdir)/$(MULTISUBDIR) \
+         -rpath $(libdir)$(MULTISUBDIR) \
          -objectlist s-libe77 \
          -objectlist s-libf77 \
          -objectlist s-libi77 \
@@ -204,9 +204,9 @@ check:
        cd libU77; $(MAKE) G77DIR=../../../gcc/ check
 
 install: all
-       $(LIBTOOL) --mode=install $(INSTALL) $(LIBG2C) $(libdir)/$(MULTISUBDIR)
-       $(INSTALL_DATA) libfrtbegin.a $(libsubdir)/$(MULTISUBDIR)
-       $(RANLIB) $(libsubdir)/$(MULTISUBDIR)/libfrtbegin.a
+       $(LIBTOOL) --mode=install $(INSTALL) $(LIBG2C) $(libdir)$(MULTISUBDIR)
+       $(INSTALL_DATA) libfrtbegin.a $(libsubdir)$(MULTISUBDIR)
+       $(RANLIB) $(libsubdir)$(MULTISUBDIR)/libfrtbegin.a
        $(INSTALL_DATA) g2c.h $(libsubdir)/include/g2c.h
        @if [ -f f2c-install-ok -o -f $(srcdir)/f2c-install-ok ]; then \
          echo ''; \
@@ -224,8 +224,8 @@ install-strip:
        $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
 uninstall:
-       rm -f $(libsubdir)/$(MULTISUBDIR)/include/g2c.h $(libdir)/$(MULTISUBDIR)/$(LIBG2C_BASE).*
-       rm -f $(prefix)/lib/$(LIBG2C_BASE).so*
+       rm -f $(libsubdir)$(MULTISUBDIR)/include/g2c.h
+       $(LIBTOOL) --mode=uninstall rm -f $(libdir)$(MULTISUBDIR)/$(LIBG2C_BASE).la
        $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@"
 
 mostlyclean: