From d8bd48f7c6f297e92fc7c94c7fe9209d705285b4 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Mon, 5 Mar 2007 23:19:10 +0000 Subject: Merge from gcc: +2007-03-01 Brooks Moses + + * configure.ac: Add "--with-pdfdir" configure option, + which defines pdfdir variable. + * Makefile.def (target=fixincludes): Add install-pdf to + missing targets. + (recursive_targets): Add install-pdf target. + (flags_to_pass): Add pdfdir. + * Makefile.tpl: Add pdfdir handling, add do-install-pdf + target. + * configure: Regenerate + * Makefile.in: Regenerate + +2007-02-28 Eric Christopher + + Revert: + 2006-12-07 Mike Stump + + * Makefile.def (dependencies): Add dependency for + install-target-libssp and install-target-libgomp on + install-gcc. + * Makefile.in: Regenerate. + +2007-02-27 Matt Kraai + + * configure: Regenerate. + * configure.ac: Move statements after variable declarations. + --- Makefile.tpl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Makefile.tpl') diff --git a/Makefile.tpl b/Makefile.tpl index a3c5093b1b4..1502ecf264c 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -61,6 +61,7 @@ oldincludedir = @oldincludedir@ infodir = @infodir@ datarootdir = @datarootdir@ docdir = @docdir@ +pdfdir = @pdfdir@ htmldir = @htmldir@ mandir = @mandir@ man1dir = $(mandir)/man1 @@ -570,7 +571,8 @@ do-[+make_target+]: # Here are the targets which correspond to the do-X targets. -.PHONY: info installcheck dvi pdf html install-info install-html +.PHONY: info installcheck dvi pdf html +.PHONY: install-info install-pdf install-html .PHONY: clean distclean mostlyclean maintainer-clean realclean .PHONY: local-clean local-distclean local-maintainer-clean info: do-info @@ -589,6 +591,8 @@ install-info: do-install-info dir.info $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \ else true ; fi +install-pdf: do-install-pdf + install-html: do-install-html local-clean: -- cgit v1.2.1