From 8ccfe116d0c9ec3afb1cff7f8d41512c8f63466e Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Thu, 9 Jan 2003 20:50:25 +0000 Subject: * Makefile.tpl (BASE_FLAGS_TO_PASS): Also pass DESTDIR. (install-info, dir.info): Prepend $(DESTDIR) to $(infodir). * Makefile.in: Regenerate. --- Makefile.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 43fad1bee..7acf526ae 100644 --- 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 -- cgit v1.2.3