15 files changed, 50 insertions, 14 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 928e88c..d810897 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-29  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* configure.in (target_list): Add generated-manpages.
+	* configure: Regenerate.
+	* Makefile.in (generated-manpages): Depend on
+	lang.generated-manpages.
+	* objc/Make-lang.in (objc.generated-manpages): New dummy target.
+
 2001-11-29  Nick Clifton  <nickc@cambridge.redhat.com>
 
 	* config/arm/crti.asm (_init): Add .thumb_func if compiled
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index b9c3c15..7f0ca26 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2361,7 +2361,8 @@ cppinternals.dvi: $(docdir)/cppinternals.texi
 	$(TEXI2DVI) -I $(docdir) -I $(docdir)/include $(docdir)/cppinternals.texi
 
 generated-manpages: $(docdir)/gcov.1 $(docdir)/cpp.1 $(docdir)/gcc.1 \
-	 $(docdir)/gfdl.7 $(docdir)/gpl.7 $(docdir)/fsf-funding.7
+	 $(docdir)/gfdl.7 $(docdir)/gpl.7 $(docdir)/fsf-funding.7 \
+	 lang.generated-manpages
 
 $(docdir)/gcov.1: $(docdir)/gcov.texi
 	$(STAMP) $(docdir)/gcov.1
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 8c501db..3da0b5b 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-29  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* Make-lang.in (ada.generated-manpages): New dummy target.
+
 2001-11-29  Ed Schonberg <schonber@gnat.com>
 
 	* g-os_lib.adb (Add_To_Command): use explicit loop to move string 
diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in
index 2842f1b..e8b128a 100644
--- a/gcc/ada/Make-lang.in
+++ b/gcc/ada/Make-lang.in
@@ -250,6 +250,7 @@ ada.start.encap:
 ada.rest.encap: 
 ada.info:
 ada.dvi:
+ada.generated-manpages:
 
 # Install hooks:
 # gnat1 is installed elsewhere as part of $(COMPILERS).
diff --git a/gcc/ch/ChangeLog b/gcc/ch/ChangeLog
index 4f39a202..af7c838 100644
--- a/gcc/ch/ChangeLog
+++ b/gcc/ch/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-29  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* Make-lang.in (CHILL.generated-manpages): New dummy target.
+
 2001-10-31  Joseph S. Myers  <jsm28@cam.ac.uk>
 
 	* ChangeLog, actions.c, ch-tree.def, decl.c, except.c, inout.c,
diff --git a/gcc/ch/Make-lang.in b/gcc/ch/Make-lang.in
index 87965ab..a45d9cd 100644
--- a/gcc/ch/Make-lang.in
+++ b/gcc/ch/Make-lang.in
@@ -107,6 +107,7 @@ CHILL.all.cross: chill-cross
 CHILL.start.encap: chill
 CHILL.rest.encap:
 CHILL.dvi: ch/chill.dvi
+CHILL.generated-manpages:
 
 CHILL.info: $(srcdir)/ch/chill.info
 
diff --git a/gcc/configure b/gcc/configure
index 0c8cca9..9b9e764 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -7944,7 +7944,7 @@ done
 rm -f Make-hooks
 touch Make-hooks
 target_list="all.build all.cross start.encap rest.encap \
-	info dvi \
+	info dvi generated-manpages \
 	install-normal install-common install-info install-man \
 	uninstall \
 	mostlyclean clean distclean extraclean maintainer-clean \
diff --git a/gcc/configure.in b/gcc/configure.in
index 3ccd686..eebf810 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -2038,7 +2038,7 @@ done
 rm -f Make-hooks
 touch Make-hooks
 target_list="all.build all.cross start.encap rest.encap \
-	info dvi \
+	info dvi generated-manpages \
 	install-normal install-common install-info install-man \
 	uninstall \
 	mostlyclean clean distclean extraclean maintainer-clean \
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ea6353b..7125e6f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-29  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* Make-lang.in (c++.generated-manpages): New dummy target.
+
 Tue Nov 27 09:03:47 2001  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
 	* Make-lang.in (cp-lang.o): Depends on c-common.h.
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index f9700ba..2a4d6af 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -134,6 +134,7 @@ c++.rest.encap: $(DEMANGLER_PROG)
 
 c++.info: 
 c++.dvi:
+c++.generated-manpages:
 
 #
 # Install hooks:
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index bfb5482..22d3e33 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,12 @@
+2001-11-29  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* Make-lang.in (f77.generated-manpages): New target.
+	($(srcdir)/f/g77.1): Don't check $(GENERATED_MANPAGES).  Allow
+	manpage generation to fail.
+	(f77.info): Don't depend on $(srcdir)/f/g77.1.
+	(f77.install-man): Depend on $(GENERATED_MANPAGES) rather than
+	directly on $(srcdir)/g77.1.
+
 2001-11-24  Toon Moene  <toon@moene.indiv.nluug.nl>
 
 	PR fortran/3957
diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index 9df4609..ce6658d 100644
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -151,10 +151,9 @@ f77.all.cross: g77-cross$(exeext)
 f77.start.encap: g77$(exeext)
 f77.rest.encap:
 
-# Note the kludge to get g77.1 to build.
-
-f77.info: $(srcdir)/f/g77.info $(srcdir)/f/g77.1
+f77.info: $(srcdir)/f/g77.info
 f77.dvi: f/g77.dvi
+f77.generated-manpages: $(srcdir)/f/g77.1
 
 # g77 documentation.
 $(srcdir)/f/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
@@ -178,13 +177,11 @@ f/g77.dvi: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
 	cd f && $(TEXI2DVI) -I $$s/doc/include $$s/f/g77.texi
 
 $(srcdir)/f/g77.1: $(srcdir)/f/invoke.texi
-	if [ x$(GENERATED_MANPAGES) = xgenerated-manpages ]; then \
-          $(TEXI2POD) < $(srcdir)/f/invoke.texi > f/g77.pod; \
-          ($(POD2MAN) --section=1 f/g77.pod > f/g77.1.T$$$$ && \
-              mv -f f/g77.1.T$$$$ $(srcdir)/f/g77.1) || \
-              (rm -f f/g77.1.T$$$$ && exit 1); \
-          rm -f f/g77.pod; \
-	else true; fi
+	-$(TEXI2POD) < $(srcdir)/f/invoke.texi > f/g77.pod; \
+	($(POD2MAN) --section=1 f/g77.pod > f/g77.1.T$$$$ && \
+	    mv -f f/g77.1.T$$$$ $(srcdir)/f/g77.1) || \
+	    (rm -f f/g77.1.T$$$$ && exit 1); \
+	rm -f f/g77.pod; \
 
 # This dance is all about producing accurate documentation for g77's
 # intrinsics with minimum fuss.  f/ansify appends "\n\" to C strings
@@ -292,7 +289,7 @@ f77.install-info: f77.info installdirs
 	  else : ; fi; \
 	else : ; fi
 
-f77.install-man: $(srcdir)/f/g77.1 installdirs
+f77.install-man: $(GENERATED_MANPAGES) installdirs
 	-if [ -f f771$(exeext) ] ; then \
 	  if [ -f g77-cross$(exeext) ] ; then \
 	    rm -f $(man1dir)/$(G77_CROSS_NAME)$(man1ext); \
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 206089a..d8a5289 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-29  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* Make-lang.in (java.generated-manpages): New dummy target.
+
 2001-11-27  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
 	* jvspec.c (jvgenmain_spec): Cannot use %umain, breaks
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index f217139..463ba8e 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -149,6 +149,7 @@ java.rest.encap:
 
 java.info: $(srcdir)/java/gcj.info
 java.dvi: java/gcj.dvi
+java.generated-manpages:
 
 # Install hooks:
 # jc1, gcj, jvgenmain, and gcjh are installed elsewhere as part
diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in
index 5fec773..910f1c6 100644
--- a/gcc/objc/Make-lang.in
+++ b/gcc/objc/Make-lang.in
@@ -95,6 +95,7 @@ objc.rest.encap:
 
 objc.info:
 objc.dvi:
+objc.generated-manpages:
 
 #
 # Install hooks: