diff options
| author | Christian Cornelssen <ccorn@cs.tu-berlin.de> | 2003-01-09 08:57:00 +0100 |
|---|---|---|
| committer | Andreas Jaeger <aj@gcc.gnu.org> | 2003-01-09 08:57:00 +0100 |
| commit | 3fbe8e4a05b608d525ae3b52daebdca0440be8f3 (patch) | |
| tree | 7d19a7cd81f76eae47d67f4b60e9d0395b650f1c /Makefile.tpl | |
| parent | fe77449a165426dfd6793158bc15204736ddd783 (diff) | |
| download | gcc-3fbe8e4a05b608d525ae3b52daebdca0440be8f3.tar.gz | |
Makefile.tpl (BASE_FLAGS_TO_PASS): Also pass DESTDIR.
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.
From-SVN: r61074
Diffstat (limited to 'Makefile.tpl')
| -rw-r--r-- | Makefile.tpl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.tpl b/Makefile.tpl index 8b66bb6cbb4..5e423826cdd 100644 --- 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 |