aboutsummaryrefslogtreecommitdiff
path: root/libf2c
diff options
context:
space:
mode:
authorToon Moene <toon@moene.indiv.nluug.nl>2002-01-18 20:58:48 +0100
committerToon Moene <toon@gcc.gnu.org>2002-01-18 19:58:48 +0000
commit5784b114565ea0c3fca3ea6d0e6558d3e03d645f (patch)
tree37d280fa7b0b55460b8fb3248bf6fe54c89243fd /libf2c
parent1f7d54133e94718d59b3c3c0ce0c4dcfa148dc80 (diff)
downloadgcc-5784b114565ea0c3fca3ea6d0e6558d3e03d645f.zip
gcc-5784b114565ea0c3fca3ea6d0e6558d3e03d645f.tar.gz
gcc-5784b114565ea0c3fca3ea6d0e6558d3e03d645f.tar.bz2
Makefile.in: Install libg2c.{a|la|so} in $(libdir)$(MULTISUBDIR) instead of...
2002-01-18 Toon Moene <toon@moene.indiv.nluug.nl> * Makefile.in: Install libg2c.{a|la|so} in $(libdir)$(MULTISUBDIR) instead of $(libsubdir)$(MULTISUBDIR). From-SVN: r48994
Diffstat (limited to 'libf2c')
-rw-r--r--libf2c/ChangeLog5
-rw-r--r--libf2c/Makefile.in6
2 files changed, 8 insertions, 3 deletions
diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog
index f19d502..18ec81d 100644
--- a/libf2c/ChangeLog
+++ b/libf2c/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-18 Toon Moene <toon@moene.indiv.nluug.nl>
+
+ * Makefile.in: Install libg2c.{a|la|so} in $(libdir)$(MULTISUBDIR)
+ instead of $(libsubdir)$(MULTISUBDIR).
+
2002-01-15 Loren J. Rittle <ljrittle@acm.org>
* libI77/configure.in: Remove fcntl.h check; never define
diff --git a/libf2c/Makefile.in b/libf2c/Makefile.in
index 18354a8..90ce6ae 100644
--- 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 $(libsubdir)/$(MULTISUBDIR) \
+ -rpath $(libdir)$(MULTISUBDIR) \
-objectlist s-libe77 \
-objectlist s-libf77 \
-objectlist s-libi77 \
@@ -204,7 +204,7 @@ check:
cd libU77; $(MAKE) G77DIR=../../../gcc/ check
install: all
- $(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIBG2C) $(libsubdir)/$(MULTISUBDIR)
+ $(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
@@ -224,7 +224,7 @@ install-strip:
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
uninstall:
- rm -f $(libsubdir)/$(MULTISUBDIR)/include/g2c.h $(libsubdir)/$(MULTISUBDIR)/$(LIBG2C_BASE).*
+ rm -f $(libsubdir)/$(MULTISUBDIR)/include/g2c.h $(libdir)$(MULTISUBDIR)/$(LIBG2C_BASE).*
rm -f $(prefix)/lib/$(LIBG2C_BASE).so*
$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@"