From a3ca38d2684394ca896817525d455d50a96403da Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Mon, 5 Mar 2007 23:19:10 +0000
Subject: Merge from gcc:

+2007-03-01  Brooks Moses  <brooks.moses@codesourcery.com>
+
+	* 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  <echristo@apple.com>
+
+	Revert:
+	2006-12-07  Mike Stump  <mrs@apple.com>
+
+	* Makefile.def (dependencies): Add dependency for
+	install-target-libssp and install-target-libgomp on
+	install-gcc.
+	* Makefile.in: Regenerate.
+
+2007-02-27  Matt Kraai  <kraai@ftbfs.org>
+
+	* configure: Regenerate.
+	* configure.ac: Move statements after variable declarations.
+
---
 Makefile.def | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'Makefile.def')

diff --git a/Makefile.def b/Makefile.def
index 33d4464..926c934 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -55,6 +55,7 @@ host_modules= { module= fixincludes;
 		missing= dvi;
 		missing= pdf;
 		missing= TAGS;
+		missing= install-pdf;
 		missing= install-info;
 		missing= installcheck; };
 host_modules= { module= flex; no_check_cross= true; };
@@ -166,6 +167,9 @@ recursive_targets = { make_target= TAGS;
 recursive_targets = { make_target= install-info; 
                       depend=configure;
                       depend=info; };
+recursive_targets = { make_target= install-pdf; 
+                      depend=configure;
+                      depend=pdf; };
 recursive_targets = { make_target= install-html; 
                       depend=configure;
                       depend=html; };
@@ -189,6 +193,7 @@ flags_to_pass = { flag= includedir ; };
 flags_to_pass = { flag= datarootdir ; };
 flags_to_pass = { flag= docdir ; };
 flags_to_pass = { flag= infodir ; };
+flags_to_pass = { flag= pdfdir ; };
 flags_to_pass = { flag= htmldir ; };
 flags_to_pass = { flag= libdir ; };
 flags_to_pass = { flag= libexecdir ; };
@@ -484,10 +489,6 @@ dependencies = { module=all-target-libobjc; on=all-target-libiberty; };
 dependencies = { module=all-target-libobjc; on=all-target-boehm-gc; };
 dependencies = { module=all-target-libstdc++-v3; on=all-target-libiberty; };
 
-// Target libraries installed under gcc need to be installed before gcc
-dependencies = { module=install-target-libssp; on=install-gcc; };
-dependencies = { module=install-target-libgomp; on=install-gcc; };
-
 // Target modules in the 'src' repository.
 lang_env_dependencies = { module=examples; };
 lang_env_dependencies = { module=libtermcap; };
-- 
cgit v1.1