From 97ae108d1453bc46ab20ba523134f4da0acf0cf5 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Mon, 20 Oct 2003 20:58:26 +0000 Subject: 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 * 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 * Make-lang.in (c++.install-info): Remove. Mon Oct 20 13:49:43 2003 Mark Mitchell * 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 * 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 * Make-lang.in (info): Use docobjdir. ($(srcdir)/treelang/treelang.info): Replace with ... ($(docobjdir)/treelang/treelang.info): ... this. (install-info): New target. From-SVN: r72718 --- gcc/treelang/ChangeLog | 7 +++++++ gcc/treelang/Make-lang.in | 25 ++++++------------------- 2 files changed, 13 insertions(+), 19 deletions(-) (limited to 'gcc/treelang') 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 + + * 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 * 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: -- cgit v1.1