diff options
| author | DJ Delorie <dj@delorie.com> | 2003-01-09 20:50:25 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2003-01-09 20:50:25 +0000 |
| commit | e7a670e512b0a4776dae801eebf82e7dc740c645 (patch) | |
| tree | cd5050c90e63ff50559be3dfde745be7741a131b | |
| parent | 9341ca73ab2737236498950e6a57fda37ef87914 (diff) | |
| download | gdb-e7a670e512b0a4776dae801eebf82e7dc740c645.tar.gz | |
* Makefile.tpl (BASE_FLAGS_TO_PASS): Also pass DESTDIR.cagney-unwind-20030108-branchpoint
(install-info, dir.info): Prepend $(DESTDIR) to $(infodir).
* Makefile.in: Regenerate.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | Makefile.tpl | 5 |
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 656bf440b3d..55456400384 100644 --- 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 43fad1bee41..7acf526ae76 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 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 |