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
This commit is contained in:
Christian Cornelssen 2003-01-28 22:53:32 +01:00 committed by Alexandre Oliva
parent afc51a6520
commit 148d6f46d4
2 changed files with 11 additions and 4 deletions

View File

@ -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.

View File

@ -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