* Makefile.tpl (BASE_FLAGS_TO_PASS): Also pass DESTDIR.

(install-info, dir.info): Prepend $(DESTDIR) to $(infodir).
* Makefile.in: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index 656bf440b3d32c4cb2c3e5d3f7a5dd3a1a4857f2..554564003847ebad629d13d295dae55aa641e250 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-09  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
+
+       * Makefile.tpl (BASE_FLAGS_TO_PASS): Also pass DESTDIR.
+       (install-info, dir.info): Prepend $(DESTDIR) to $(infodir).
+       * Makefile.in: Regenerate.
+
 2003-01-09  Alexandre Oliva  <aoliva@redhat.com>
 
        * configure.in: Remove Makefile in build, host and target modules

diff --git a/Makefile.in b/Makefile.in
index 43fad1bee41040055745503b0935c44eb1356d37..7acf526ae76ef840e7c129ffe2330ba509df0716 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -385,6 +385,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)" \
@@ -1076,7 +1077,7 @@ do-info: maybe-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:
@@ -1207,7 +1208,7 @@ installdirs: mkinstalldirs
 
 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

diff --git a/Makefile.tpl b/Makefile.tpl
index 8b66bb6cbb4bd55e803db25707c94fc787f1dc75..5e423826cddde225198a270722b6bddf6fe1760a 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -388,6 +388,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)" \
@@ -633,7 +634,7 @@ do-info: maybe-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:
@@ -764,7 +765,7 @@ installdirs: mkinstalldirs
 
 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