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

2 files changed, 36 insertions, 45 deletions

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: