Makefile.in (install-info): Simplify.

	* Makefile.in (install-info): Simplify.
	($(DESTDIR)$(infodir)/%.info): New rule.
	* configure.in (target_list): Remove install-info.
	* doc/.cvsignore (gcc.info*): Remove.
	(gccint.info*): Likewise.
	(gccinstall.info*): Likewise.
	(cpp.info*): Likewise.
	(cppinternals.info*): Likewise.
	(*.info*): Add it.
	* doc/sourcebuild.texi: Update description of install-info.
	* objc/Make-lang.in (objc.install-info): Remove.

2003-10-20  Mark Mitchell  <mark@codesourcery.com>

	* Make-lang.in (ada.install-info): Remove target.
	(info): New target.
	(install-info): Likewise.
	(gnat_ug_unx.info): Simplify rule.
	(gnat_ug_vmx.info): Likewise.
	(gnat_ug_vxw.info): Likewise.
	(gnat_ug_wnt.info): Likewise.
	(gnat_rm.info): Likewise.
	(gnat-style.info): Likewise.

2003-10-20  Mark Mitchell  <mark@codesourcery.com>

	* Make-lang.in (c++.install-info): Remove.

Mon Oct 20 13:49:43 2003  Mark Mitchell  <mark@codesourcery.com>

	* Make-lang.in (.PHONY): Remove f77.info, f77.install-info.
	(info): Update dependencies.
	($(srcdir)/f/g77.info): Replace with ...
	($(docobjdir)/g77.info): ... this.
	(f77.install-info): Remove.
	(install-info): New target.

2003-10-20  Mark Mitchell  <mark@codesourcery.com>

	* Make-lang.in (info): Update dependencies.
	(java.install-info): Remove.
	($(srcdir)/java/gcj.info): Replace with ...
	($(docobjdir)/gcj.info): ... this.

2003-10-20  Mark Mitchell  <mark@codesourcery.com>

	* Make-lang.in (info): Use docobjdir.
	($(srcdir)/treelang/treelang.info): Replace with ...
	($(docobjdir)/treelang/treelang.info): ... this.
	(install-info): New target.

From-SVN: r72718

16 files changed, 117 insertions, 138 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6219b28..93c69e6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2003-10-20  Mark Mitchell  <mark@codesourcery.com>
+
+	* Makefile.in (install-info): Simplify.
+	($(DESTDIR)$(infodir)/%.info): New rule.
+	* configure.in (target_list): Remove install-info.
+	* doc/.cvsignore (gcc.info*): Remove.
+	(gccint.info*): Likewise.
+	(gccinstall.info*): Likewise.
+	(cpp.info*): Likewise.
+	(cppinternals.info*): Likewise.
+	(*.info*): Add it.
+	* doc/sourcebuild.texi: Update description of install-info.
+	* objc/Make-lang.in (objc.install-info): Remove.
+
 2003-10-20  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
 	* config/mips/linux.h (TARGET_OS_CPP_BUILTINS): Define _ABIO32.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 7ba6b7d..a7d0b40 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2959,27 +2959,28 @@ install-driver: installdirs xgcc$(exeext)
 # Install the info files.
 # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir
 # to do the install.
-install-info: doc installdirs lang.install-info
-	-rm -f $(DESTDIR)$(infodir)/cpp.info* $(DESTDIR)$(infodir)/gcc.info*
-	-rm -f $(DESTDIR)$(infodir)/cppinternals.info* $(DESTDIR)$(infodir)/gccint.info*
-	if [ -f $(docobjdir)/gcc.info ]; then \
-	  for f in $(docobjdir)/cpp.info* $(docobjdir)/gcc.info* \
-		$(docobjdir)/cppinternals.info* $(docobjdir)/gccint.info*; do \
+install-info:: doc installdirs \
+	$(DESTDIR)$(infodir)/cpp.info \
+	$(DESTDIR)$(infodir)/gcc.info \
+	$(DESTDIR)$(infodir)/cppinternals.info \
+	$(DESTDIR)$(infodir)/gccint.info
+
+$(DESTDIR)$(infodir)/%.info: $(docobjdir)/%.info installdirs
+	rm -f $@
+	if [ -f $< ]; then \
+	  for f in $(<)*; do \
 	    realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
 	    $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \
 	  done; \
 	else true; fi
 	-if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
 	  if [ -f $(DESTDIR)$(infodir)/dir ] ; then \
-	    for f in cpp.info gcc.info gccint.info cppinternals.info; do \
-		if [ -f $(DESTDIR)$(infodir)/$$f ]; then \
-		  install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \
-		else true; fi; \
-	    done; \
+	    if [ -f $@ ]; then \
+	      install-info --dir-file=$(DESTDIR)$(infodir)/dir $@ \
+	    else true; fi; \
 	  else true; fi; \
 	else true; fi;
-	-chmod a-x $(DESTDIR)$(infodir)/cpp.info* $(DESTDIR)$(infodir)/gcc.info*
-	-chmod a-x $(DESTDIR)$(infodir)/cppinternals.info* $(DESTDIR)$(infodir)/gccint.info*
+	chmod a-x $(@)*
 
 # Install the man pages.
 install-man: installdirs $(GENERATED_MANPAGES) lang.install-man
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index eb1257d..e71406d 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,15 @@
+2003-10-20  Mark Mitchell  <mark@codesourcery.com>
+
+	* Make-lang.in (ada.install-info): Remove target.
+	(info): New target.
+	(install-info): Likewise.
+	(gnat_ug_unx.info): Simplify rule.
+	(gnat_ug_vmx.info): Likewise.
+	(gnat_ug_vxw.info): Likewise.
+	(gnat_ug_wnt.info): Likewise.
+	(gnat_rm.info): Likewise.
+	(gnat-style.info): Likewise.
+
 2003-10-14  Nathanael Nerode  <neroden@gcc.gnu.org>
 
 	* Make-lang.in: Replace uses of $(target_alias) with
diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in
index ea9f1f1..f3cc25a 100644
--- a/gcc/ada/Make-lang.in
+++ b/gcc/ada/Make-lang.in
@@ -23,7 +23,7 @@
 # Each language makefile fragment must provide the following targets:
 #
 # foo.all.cross, foo.start.encap, foo.rest.encap,
-# foo.install-normal, foo.install-common, foo.install-info, foo.install-man,
+# foo.install-normal, foo.install-common, foo.install-man,
 # foo.uninstall, foo.mostlyclean, foo.clean, foo.distclean, foo.extraclean,
 # foo.maintainer-clean, foo.stage1, foo.stage2, foo.stage3, foo.stage4
 #
@@ -369,60 +369,40 @@ $(srcdir)/ada/gnat_ug_wnt.texi : ada/doctools/xgnatug \
 	$(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words
 	ada/doctools/xgnatug wnt $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words $(srcdir)/ada/gnat_ug_wnt.texi
 
-$(srcdir)/ada/gnat_ug_unx.info : $(srcdir)/ada/gnat_ug_unx.texi \
+$(docobjdir)/gnat_ug_unx.info : $(srcdir)/ada/gnat_ug_unx.texi \
 	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
-	cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_ug_unx.info ada/gnat_ug_unx.texi
+	$(MAKEINFO) -I $(docdir)/include -I $(srcdir)/ada -o $@ $<
 
-$(srcdir)/ada/gnat_ug_vms.info : $(srcdir)/ada/gnat_ug_vms.texi \
+$(docobjdir)/gnat_ug_vms.info : $(srcdir)/ada/gnat_ug_vms.texi \
 	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
-	cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_ug_vms.info ada/gnat_ug_vms.texi
+	$(MAKEINFO) -I $(docdir)/include -I $(srcdir)/ada -o $@ $<
 
-$(srcdir)/ada/gnat_ug_vxw.info : $(srcdir)/ada/gnat_ug_vxw.texi \
+$(docobjdir)/gnat_ug_vxw.info : $(srcdir)/ada/gnat_ug_vxw.texi \
 	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
-	cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_ug_vxw.info ada/gnat_ug_vxw.texi
+	$(MAKEINFO) -I $(docdir)/include -I $(srcdir)/ada -o $@ $<
 
-$(srcdir)/ada/gnat_ug_wnt.info : $(srcdir)/ada/gnat_ug_wnt.texi \
+$(docobjdir)/gnat_ug_wnt.info : $(srcdir)/ada/gnat_ug_wnt.texi \
 	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
-	cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_ug_wnt.info ada/gnat_ug_wnt.texi
+	$(MAKEINFO) -I $(docdir)/include -I $(srcdir)/ada -o $@ $<
 
-$(srcdir)/ada/gnat_rm.info : $(srcdir)/ada/gnat_rm.texi \
+$(docobjdir)/gnat_rm.info : $(srcdir)/ada/gnat_rm.texi \
 	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
-	cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_rm.info ada/gnat_rm.texi
+	$(MAKEINFO) -I $(docdir)/include -I $(srcdir)/ada -o $@ $<
 
-$(srcdir)/ada/gnat-style.info : $(srcdir)/ada/gnat-style.texi \
+$(docobjdir)/gnat-style.info : $(srcdir)/ada/gnat-style.texi \
 	$(srcdir)/doc/include/fdl.texi
-	cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat-style.info ada/gnat-style.texi
-
-info:: $(srcdir)/ada/gnat_ug_vms.info $(srcdir)/ada/gnat_ug_wnt.info \
-	$(srcdir)/ada/gnat_ug_unx.info $(srcdir)/ada/gnat_ug_vxw.info \
-	$(srcdir)/ada/gnat_rm.info $(srcdir)/ada/gnat-style.info
-
-ada.install-info:
-	-rm -f $(DESTDIR)$(infodir)/gnat_ug_*.info*
-	-rm -f $(DESTDIR)$(infodir)/gnat_rm.info* 
-	-rm -f $(DESTDIR)$(infodir)/gnat-style.info* 
-	$(MKDIR) $(DESTDIR)$(infodir)
-	if [ -f $(srcdir)/ada/gnat_ug_unx.info ]; then \
-	  for f in $(srcdir)/ada/gnat_ug_*.info* \
-		$(srcdir)/ada/gnat_rm.info* \
-		$(srcdir)/ada/gnat-style.info*; do \
-	    realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
-	    $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \
-	  done; \
-	else true; fi
-	-if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-	  if [ -f $(DESTDIR)$(infodir)/dir ] ; then \
-	    for f in gnat_ug_vms.info gnat_ug_wnt.info gnat_ug_unx.info \
-		gnat_ug_vxw.info gnat_rm.info gnat-style.info; do \
-		if [ -f $(DESTDIR)$(infodir)/$$f ]; then \
-		  install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \
-		else true; fi; \
-	    done; \
-	  else true; fi; \
-	else true; fi;
-	-chmod a-x $(DESTDIR)$(infodir)/gnat_ug_vms.info* $(DESTDIR)$(infodir)/gnat_ug_wnt.info*
-	-chmod a-x $(DESTDIR)$(infodir)/gnat_ug_unx.info* $(DESTDIR)$(infodir)/gnat_ug_vxw.info*
-	-chmod a-x $(DESTDIR)$(infodir)/gnat_rm.info* $(DESTDIR)$(infodir)/gnat-style.info*
+	$(MAKEINFO) -I $(docdir)/include -I $(srcdir)/ada -o $@ $<
+
+info:: $(docobjdir)/gnat_ug_vms.info $(docobjdir)/gnat_ug_wnt.info \
+	$(docobjdir)/gnat_ug_unx.info $(docobjdir)/gnat_ug_vxw.info \
+	$(docobjdir)/gnat_rm.info $(docobjdir)/gnat-style.info
+
+install-info:: $(DESTDIR)$(infodir)/gnat_ug_vms.info \
+	$(DESTDIR)$(infodir)/gnat_ug_wnt.info \
+	$(DESTDIR)$(infodir)/gnat_ug_unx.info \
+	$(DESTDIR)$(infodir)/gnat_ug_vxw.info \
+	$(DESTDIR)$(infodir)/gnat_rm.info \
+	$(DESTDIR)$(infodir)/gnat-style.info
 
 ada/gnat_ug_unx.dvi : $(srcdir)/ada/gnat_ug_unx.texi \
 	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
@@ -697,7 +677,6 @@ ada.install-common:
 install-gnatlib:
 	cd ada && $(MAKE) $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) install-gnatlib
 
-ada.install-info:
 ada.install-man:
 
 ada.uninstall:
diff --git a/gcc/configure.in b/gcc/configure.in
index 89f68b6..948c342 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -2828,7 +2828,7 @@ done
 rm -f Make-hooks
 touch Make-hooks
 target_list="all.build all.cross start.encap rest.encap tags \
-	install-normal install-common install-info install-man \
+	install-normal install-common install-man \
 	uninstall \
 	mostlyclean clean distclean extraclean maintainer-clean \
 	stage1 stage2 stage3 stage4 stageprofile stagefeedback"
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8222fbb..1acee5f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-20  Mark Mitchell  <mark@codesourcery.com>
+
+	* Make-lang.in (c++.install-info): Remove.
+
 2003-10-20  Jason Merrill  <jason@redhat.com>
 
 	* class.c (layout_class_type): Set DECL_ARTIFICIAL on padding
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index b36627f..8017bbb 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -23,7 +23,7 @@
 # Each language makefile fragment must provide the following targets:
 #
 # foo.all.build, foo.all.cross, foo.start.encap, foo.rest.encap,
-# foo.install-normal, foo.install-common, foo.install-info, foo.install-man,
+# foo.install-normal, foo.install-common, foo.install-man,
 # foo.uninstall,
 # foo.mostlyclean, foo.clean, foo.distclean, foo.extraclean,
 # foo.maintainer-clean, foo.stage1, foo.stage2, foo.stage3, foo.stage4
@@ -159,8 +159,6 @@ c++.install-common: installdirs
 	  fi ; \
 	fi
 
-c++.install-info: 
-
 cp/g++.1:
 	-rm -f $@
 	if [ "$(ALL)" = all.cross ]; then \
diff --git a/gcc/doc/.cvsignore b/gcc/doc/.cvsignore
index 8b50862..169b3ef 100644
--- a/gcc/doc/.cvsignore
+++ b/gcc/doc/.cvsignore
@@ -1,8 +1,4 @@
-gcc.info*
-gccint.info*
-gccinstall.info*
-cpp.info*
-cppinternals.info*
+*.info*
 gcc.1
 cpp.1
 gcov.1
diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi
index e4a1bae..c29a64e 100644
--- a/gcc/doc/sourcebuild.texi
+++ b/gcc/doc/sourcebuild.texi
@@ -588,10 +588,8 @@ compiler executables listed in @code{compilers} in
 @file{config-lang.in}.
 @item install-info
 Install info documentation for the front end, if it is present in the
-source directory.  (It may not be present if a suitable version of
-@command{makeinfo} was not installed.)  This target should run the
-command @command{install-info} to update the info directory, but
-should ignore errors when running that command.
+source directory.  This target should have dependencies on info files
+that should be installed.  This hook is a double-colon hook.
 @item install-man
 Install man pages for the front end.  This target should ignore
 errors.
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 281e997..ca16a6d 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,12 @@
+Mon Oct 20 13:49:43 2003  Mark Mitchell  <mark@codesourcery.com>
+
+	* Make-lang.in (.PHONY): Remove f77.info, f77.install-info.
+	(info): Update dependencies.
+	($(srcdir)/f/g77.info): Replace with ...
+	($(docobjdir)/g77.info): ... this.
+	(f77.install-info): Remove.
+	(install-info): New target.
+
 2003-10-06  Mark Mitchell  <mark@codesourcery.com>
 
 	* Make-lang.in (f77.info): Replace with ...
diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index f6e7d02..5f44d07 100644
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -22,7 +22,7 @@
 # Each language makefile fragment must provide the following targets:
 #
 # foo.all.build, foo.all.cross, foo.start.encap, foo.rest.encap,
-# foo.install-normal, foo.install-common, foo.install-info, foo.install-man,
+# foo.install-normal, foo.install-common, foo.install-man,
 # foo.uninstall,
 # foo.mostlyclean, foo.clean, foo.distclean, foo.extraclean,
 # foo.maintainer-clean, foo.stage1, foo.stage2, foo.stage3, foo.stage4
@@ -57,9 +57,9 @@ F77 f77: f771$(exeext)
 
 # Tell GNU make to ignore these if they exist.
 .PHONY: F77 f77 f77.all.build f77.all.cross \
-  f77.start.encap f77.rest.encap f77.info f77.dvi \
+  f77.start.encap f77.rest.encap f77.dvi \
   f77.install-normal \
-  f77.install-common f77.install-info f77.install-man \
+  f77.install-common f77.install-man \
   f77.uninstall f77.mostlyclean f77.clean f77.distclean \
   f77.extraclean f77.maintainer-clean f77.rebuilt \
   f77.stage1 f77.stage2 f77.stage3 f77.stage4 \
@@ -148,12 +148,12 @@ f77.rest.encap:
 f77.tags: force
 	cd $(srcdir)/f; etags *.c *.h
 
-info:: $(srcdir)/f/g77.info
+info:: $(docobjdir)/g77.info
 dvi:: f/g77.dvi
 generated-manpages:: $(srcdir)/f/g77.1
 
 # g77 documentation.
-$(srcdir)/f/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
+$(docobjdir)/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
 		$(srcdir)/f/ffe.texi $(srcdir)/f/invoke.texi \
 		$(srcdir)/f/news.texi  $(srcdir)/f/intdoc.texi \
 		$(srcdir)/f/root.texi $(srcdir)/doc/include/fdl.texi \
@@ -161,8 +161,8 @@ $(srcdir)/f/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
 		$(srcdir)/doc/include/funding.texi \
 		$(srcdir)/doc/include/gcc-common.texi
 	if [ x$(BUILD_INFO) = xinfo ]; then \
-	  rm -f $(srcdir)/f/g77.info-*; \
-	  cd $(srcdir)/f && $(MAKEINFO) -I../doc/include -o g77.info g77.texi; \
+	  rm -f $(@)*; \
+	  cd $(srcdir)/f && $(MAKEINFO) -I../doc/include -o $@ g77.texi; \
 	else true; fi
 
 f/g77.dvi: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
@@ -270,23 +270,7 @@ f77.install-common: installdirs
 	  echo ''; \
 	else true; fi
 
-# $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir
-# to do the install.  The sed rule was copied from stmp-int-hdrs.
-f77.install-info: f77.info installdirs
-	if [ -f $(srcdir)/f/g77.info ] ; then \
-	  rm -f $(DESTDIR)$(infodir)/g77.info*; \
-	  for f in $(srcdir)/f/g77.info*; do \
-	      realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
-	      $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \
-	  done; \
-	  chmod a-x $(DESTDIR)$(infodir)/g77.info*; \
-	else true; fi
-	@if [ -f $(srcdir)/f/g77.info ] ; then \
-	  if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \
-	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info || : ; \
-	  else : ; fi; \
-	else : ; fi
+install-info:: $(DESTDIR)$(infodir)/g77.info
 
 f77.install-man: $(GENERATED_MANPAGES) installdirs
 	-if [ -f f771$(exeext) ] ; then \
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index e27ea02..57109df 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-20  Mark Mitchell  <mark@codesourcery.com>
+
+	* Make-lang.in (info): Update dependencies.
+	(java.install-info): Remove.
+	($(srcdir)/java/gcj.info): Replace with ...
+	($(docobjdir)/gcj.info): ... this.
+
 2003-10-14  Nathanael Nerode  <neroden@gcc.gnu.org>
 
 	* Make-lang.in: Replace uses of $(target_alias) with
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 8e430bd..7b9a39d 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -27,7 +27,7 @@
 # Each language makefile fragment must provide the following targets:
 #
 # foo.all.build, foo.all.cross, foo.start.encap, foo.rest.encap,
-# foo.install-normal, foo.install-common, foo.install-info, foo.install-man,
+# foo.install-normal, foo.install-common, foo.install-man,
 # foo.uninstall,
 # foo.mostlyclean, foo.clean, foo.distclean, foo.extraclean,
 # foo.maintainer-clean, foo.stage1, foo.stage2, foo.stage3, foo.stage4
@@ -160,7 +160,7 @@ java.rest.encap:
 java.tags: force
 	cd $(srcdir)/java; etags *.y *.c *.h --language=none --regex='/DEFTREECODE [(]\([A-Z_]+\)/\1/' java-tree.def
 
-info:: $(srcdir)/java/gcj.info
+info:: $(docobjdir)/gcj.info
 dvi:: java/gcj.dvi
 generated-manpages:: $(srcdir)/java/gcj.1 $(srcdir)/java/gcjh.1 \
 	$(srcdir)/java/jv-scan.1 $(srcdir)/java/jcf-dump.1 \
@@ -211,22 +211,7 @@ java.uninstall:
 	-rm -rf $(DESTDIR)$(man1dir)/gij$(man1ext)
 	-rm -rf $(DESTDIR)$(man1dir)/jv-convert$(man1ext)
 
-java.install-info: installdirs
-	if [ -f jc1$(exeext) ] ; then \
-	  if [ -f $(srcdir)/java/gcj.info ]; then \
-	    rm -f $(DESTDIR)$(infodir)/gcj.info*; \
-	    for f in $(srcdir)/java/gcj.info*; do \
-	      realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
-	      $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \
-	    done; \
-	    chmod a-x $(DESTDIR)$(infodir)/gcj.info*; \
-	  else true; fi; \
-	else true; fi
-	-if [ -f jc1$(exeext) ] && [ -f $(DESTDIR)$(infodir)/gcj.info ]; then \
-	  if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-	    install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/gcj.info; \
-	  else true; fi; \
-	else true; fi
+install-info:: $(DESTDIR)$(infodir)/gcj.info
 
 #
 # Clean hooks:
@@ -360,12 +345,12 @@ java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
 	  $(srcdir)/java/jcf-path.c $(OUTPUT_OPTION)
 
 # Documentation
-$(srcdir)/java/gcj.info: $(srcdir)/java/gcj.texi \
+$(docobjdir)/gcj.info: $(srcdir)/java/gcj.texi \
 	 $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gpl.texi \
 	 $(srcdir)/doc/include/gcc-common.texi
 	if test "x$(BUILD_INFO)" = xinfo; then \
-	  rm -f $(srcdir)/java/gcc.info*; \
-	  cd $(srcdir)/java && $(MAKEINFO) -I../doc/include -o gcj.info gcj.texi; \
+	  rm -f $(@)*; \
+	  cd $(srcdir)/java && $(MAKEINFO) -I../doc/include -o $@ gcj.texi; \
 	else true; fi
 
 java/gcj.dvi: $(srcdir)/java/gcj.texi $(srcdir)/doc/include/fdl.texi \
diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in
index 8e9d6ad..cdacd4e 100644
--- a/gcc/objc/Make-lang.in
+++ b/gcc/objc/Make-lang.in
@@ -23,7 +23,7 @@
 # Each language makefile fragment must provide the following targets:
 #
 # foo.all.build, foo.all.cross, foo.start.encap, foo.rest.encap,
-# foo.install-normal, foo.install-common, foo.install-info, foo.install-man,
+# foo.install-normal, foo.install-common, foo.install-man,
 # foo.uninstall,
 # foo.mostlyclean, foo.clean, foo.distclean, foo.extraclean,
 # foo.maintainer-clean, foo.stage1, foo.stage2, foo.stage3, foo.stage4
@@ -114,8 +114,6 @@ objc.install-normal:
 
 objc.install-common:
 
-objc.install-info:
-
 objc.install-man:
 
 objc.uninstall:
diff --git a/gcc/treelang/ChangeLog b/gcc/treelang/ChangeLog
index 223ccd5..eaf1112 100644
--- a/gcc/treelang/ChangeLog
+++ b/gcc/treelang/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-20  Mark Mitchell  <mark@codesourcery.com>
+
+	* Make-lang.in (info): Use docobjdir.
+	($(srcdir)/treelang/treelang.info): Replace with ...
+	($(docobjdir)/treelang/treelang.info): ... this.
+	(install-info): New target.
+
 2003-10-12  Andreas Jaeger  <aj@suse.de>
 
 	* Make-lang.in (treelang.install-info): Remove reference to
diff --git a/gcc/treelang/Make-lang.in b/gcc/treelang/Make-lang.in
index 8deefae..e492869 100644
--- a/gcc/treelang/Make-lang.in
+++ b/gcc/treelang/Make-lang.in
@@ -24,7 +24,7 @@
 # Each language makefile fragment must provide the following targets:
 #
 # foo.all.build, foo.all.cross, foo.start.encap, foo.rest.encap,
-# foo.install-normal, foo.install-common, foo.install-info, foo.install-man,
+# foo.install-normal, foo.install-common, foo.install-man,
 # foo.uninstall, foo.distdir,
 # foo.mostlyclean, foo.clean, foo.distclean, foo.extraclean,
 # foo.maintainer-clean, foo.stage1, foo.stage2, foo.stage3, foo.stage4
@@ -144,15 +144,15 @@ treelang.tags: force
 	cd $(srcdir)/treelang; etags *.y *.l *.c *.h
 
 .phony:treelang.info
-info:: $(srcdir)/treelang/treelang.info
+info:: $(docobjdir)/treelang.info
 
-$(srcdir)/treelang/treelang.info: $(srcdir)/treelang/treelang.texi \
+$(docobjdir)/treelang.info: $(srcdir)/treelang/treelang.texi \
 	 $(srcdir)/doc/include/gcc-common.texi \
 	 $(srcdir)/doc/include/gpl.texi \
 	 $(srcdir)/doc/include/fdl.texi \
 	 $(srcdir)/doc/include/funding.texi
 	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -Idoc/include \
-	-o treelang/treelang.info treelang/treelang.texi
+	  -o $@ treelang/treelang.texi
 
 dvi:: $(srcdir)/treelang/treelang.texi \
 	 $(srcdir)/doc/include/gcc-common.texi \
@@ -187,21 +187,8 @@ treelang.install.common.done:  installdirs treelang.done
 	done
 	$(STAMP) treelang.install.common.done
 
-treelang.install-info:
-	if [ -f $(srcdir)/treelang/treelang.info ] ; then \
-	  rm -f $(DESTDIR)$(infodir)/treelang.info*; \
-	  for f in $(srcdir)/treelang/treelang.info*; do \
-	      realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
-	      $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \
-	  done; \
-	  chmod a-x $(DESTDIR)$(infodir)/treelang.info*; \
-	else true; fi
-	@if [ -f $(srcdir)/treelang/treelang.info ] ; then \
-	  if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/treelang.info"; \
-	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/treelang.info || : ; \
-	  else : ; fi; \
-	else : ; fi
+# We might not be able to build the info files
+install-info:: $(DESTDIR)$(infodir)/treelang.info
 
 treelang.install-man: