Makefile.in (BASE_FLAGS_TO_PASS): Also pass DESTDIR.

* Makefile.in (BASE_FLAGS_TO_PASS): Also pass DESTDIR.
(MAKEDIRS): Prepend $(DESTDIR) to installdir names.
(install-info, dir.info): Prepend $(DESTDIR) to $(infodir).

From-SVN: r62020

diff --git a/ChangeLog b/ChangeLog
index 3d0be4df59621991f7985e7b32a2e61326a9f05c..ee91df3aca4faba3e48fff8774d676187c42471b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-28  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
+
+       * Makefile.in (BASE_FLAGS_TO_PASS): Also pass DESTDIR.
+       (MAKEDIRS): Prepend $(DESTDIR) to installdir names.
+       (install-info, dir.info): Prepend $(DESTDIR) to $(infodir).
+
 2002-11-19  Release Manager
 
        * GCC 3.2.1 Released.

diff --git a/Makefile.in b/Makefile.in
index 4b1634f1662c855f4cbd9db3202b5426b8380ab9..834b9ebb1495b9fe2a24b4ec9a933b3a9ccfc5db 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -365,6 +365,7 @@ BASE_FLAGS_TO_PASS = \
        "CXXFLAGS=$(CXXFLAGS)" \
        "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
        "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
+       "DESTDIR=$(DESTDIR)" \
        "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
        "INSTALL=$(INSTALL)" \
        "INSTALL_DATA=$(INSTALL_DATA)" \
@@ -1052,7 +1053,7 @@ do-info: all-texinfo
 install-info: do-install-info dir.info
        s=`cd $(srcdir); pwd`; export s; \
        if [ -f dir.info ] ; then \
-         $(INSTALL_DATA) dir.info $(infodir)/dir.info ; \
+         $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \
        else true ; fi
 
 local-clean:
@@ -1835,15 +1836,15 @@ install-sid: install-tcl install-tk
 ### other supporting targets
 
 MAKEDIRS= \
-       $(prefix) \
-       $(exec_prefix)
+       $(DESTDIR)$(prefix) \
+       $(DESTDIR)$(exec_prefix)
 .PHONY: installdirs
 installdirs: mkinstalldirs
        $(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS)
 
 dir.info: do-install-info
        if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \
-         $(srcdir)/texinfo/gen-info-dir $(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \
+         $(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \
          mv -f dir.info.new dir.info ; \
        else true ; \
        fi