diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2003-10-20 20:58:26 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2003-10-20 20:58:26 +0000 |
| commit | 97ae108d1453bc46ab20ba523134f4da0acf0cf5 (patch) | |
| tree | b60e2c205cb9edb7909cfc51e3ec1946f79825dc /gcc/java/Make-lang.in | |
| parent | ea258926e64ffdd503cd5dbd403f3f7f7364e011 (diff) | |
| download | gcc-97ae108d1453bc46ab20ba523134f4da0acf0cf5.zip gcc-97ae108d1453bc46ab20ba523134f4da0acf0cf5.tar.gz gcc-97ae108d1453bc46ab20ba523134f4da0acf0cf5.tar.bz2 | |
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
Diffstat (limited to 'gcc/java/Make-lang.in')
| -rw-r--r-- | gcc/java/Make-lang.in | 27 |
1 files changed, 6 insertions, 21 deletions
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 \ |