Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR.

* Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR.
(install, uninstall): Prepend $(DESTDIR) to destination
paths in all (un)installation commands.

From-SVN: r62014

diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog
index 7c842ba7b0e2a6bc86071f88b352d9ae3a160463..c6dd33c31aeb9378a95dc3783e6b97071708a0da 100644 (file)
--- a/libf2c/ChangeLog
+++ b/libf2c/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-28  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
+
+       * Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR.
+       (install, uninstall): Prepend $(DESTDIR) to destination
+       paths in all (un)installation commands.
+
 2003-01-27  Alexandre Oliva  <aoliva@redhat.com>
 
        * Makefile.in ($(LIBG2C)): -rpath is glibcpp_toolexeclibdir.

diff --git a/libf2c/Makefile.in b/libf2c/Makefile.in
index ced29bf2d02c09837d1c75d95debee86b76424f0..fb0f218e06403885efaed5aa7d71c81b0d3ac00d 100644 (file)
--- a/libf2c/Makefile.in
+++ b/libf2c/Makefile.in
@@ -78,6 +78,7 @@ FLAGS_TO_PASS= \
        LIBTOOL='$(LIBTOOL)' \
        CFLAGS='$(CFLAGS)' \
        CPPFLAGS='$(CPPFLAGS)' \
+       DESTDIR='$(DESTDIR)' \
        AR='$(AR)' \
        RANLIB='$(RANLIB)' \
        prefix='$(prefix)' \
@@ -211,21 +212,21 @@ check:
        cd libU77; $(MAKE) G77DIR=../../../gcc/ check
 
 install: all
-       $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(glibcpp_toolexeclibdir)
-       $(LIBTOOL) --mode=install $(INSTALL) $(LIBG2C) $(glibcpp_toolexeclibdir)
-       $(INSTALL_DATA) libfrtbegin.a $(glibcpp_toolexeclibdir)
-       $(RANLIB) $(glibcpp_toolexeclibdir)/libfrtbegin.a
-       $(INSTALL_DATA) g2c.h $(libsubdir)/include/g2c.h
+       $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(glibcpp_toolexeclibdir)
+       $(LIBTOOL) --mode=install $(INSTALL) $(LIBG2C) $(DESTDIR)$(glibcpp_toolexeclibdir)
+       $(INSTALL_DATA) libfrtbegin.a $(DESTDIR)$(glibcpp_toolexeclibdir)
+       $(RANLIB) $(DESTDIR)$(glibcpp_toolexeclibdir)/libfrtbegin.a
+       $(INSTALL_DATA) g2c.h $(DESTDIR)$(libsubdir)/include/g2c.h
        $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@"
-       @-$(LIBTOOL) --mode=finish $(glibcpp_toolexeclibdir)
+       @-$(LIBTOOL) --mode=finish $(DESTDIR)$(glibcpp_toolexeclibdir)
 
 install-strip:
        $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
 uninstall:
-       rm -f $(libsubdir)/include/g2c.h
-       rm -f $(glibcpp_toolexeclibdir)/libfrtbegin.a
-       $(LIBTOOL) --mode=uninstall rm -f $(glibcpp_toolexeclibdir)$(LIBG2C_BASE).la
+       rm -f $(DESTDIR)$(libsubdir)/include/g2c.h
+       rm -f $(DESTDIR)$(glibcpp_toolexeclibdir)/libfrtbegin.a
+       $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(glibcpp_toolexeclibdir)$(LIBG2C_BASE).la
        $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@"
 
 mostlyclean: