From a541f69dd201256fc90d4627ae2b937956d58e31 Mon Sep 17 00:00:00 2001 From: Kelley Cook Date: Wed, 21 Jan 2004 02:01:55 +0000 Subject: re PR other/12730 (manual page install broken with old Pod::man) gcc/ 2004-01-20 Kelley Cook PR bootstrap/12730 * configure.ac: Delete definition and subsitution of docdir. Add info, man, srcman and srcinfo to target hooks. Create doc/ directory. * configure: Regenerate. * Makefile.in: Don't substitute docdir and delete all references throughout. (MAKEINFOFLAGS): Define. (stmp-docobjdir): Delete. (INFOFILES, MANFILES): Define. (info): Call lang.info, srcinfo and lang.srcinfo. (generated-manpages): Call lang.man, srcman and lang.srcman. (srcinfo, srcman): New rules to copy back files to source directory. (doc/%.info, doc/%.dvi, doc/%.1, doc/%.7): New implict rule. (install-man): Revamp rule. (clean): Update dvi directory. (distclean): Delete TAGS from front end directorys. (maintainer-clean): Delete all document files in source directory. objc/Make-lang.in (objc.man, objc.info): Dummy entries. (objc.srcman, objc.srcinfo): Likewise. gcc/ada/ 2004-01-20 Kelley Cook * Make-lang.in: Replace $(docdir) with doc. (doc/gnat_ug_unx.info, doc/gnat_ug_vwx.info, doc/gnat_ug_vms.info doc/gnat_ug_wnt.info, doc/gnat_rm.info, doc/gnat-style.info): Update to use consistent MAKEINFO rule. (ada.man, ada.srcman): Dummy entry. (ADA_INFOFILES): Define. (ada.info, ada.srcinfo): New rules. gcc/cp/ 2004-01-20 Kelley Cook * Make-lang.in: Replace $(docdir) with doc. (c++.info, c++.srcinfo): Dummy entry. (c++.man, c++.srcman): New rules. (c++.install-man): Revamp rule. gcc/f/ 2004-01-20 Kelley Cook * Make-lang.in: Replace $(docdir) with doc. (TEXI_G77_FILES): Define. (f77.rebuilt): Delete. (f77.srcextra): Add dependencies on f/BUGS and f/NEWS. (f77.srcman, f77.srcinfo, f77.man, f77.info): New rules. (doc/g77.info, doc/g77.dvi): Depend on TEXI_G77_FILES. Always build in doc directory. Use $(MAKEINFOFLAGS). (info, dvi, generated_manpages): Update to look in doc directory. (f/BUGS, f/NEWS): Generate in build directory. (f77.mostlyclean): Delete BUGS and NEWS from build directory. (f77.maintainer-clean): Adjust to delete from source directory. (f77.install-man): Revamp rule. gcc/java/ 2004-01-20 Kelley Cook * Make-lang.in: Replace $(docdir) with doc. (java.info, java.srcinfo, java.man, java.srcman): New rules. (java.install-man): Revamp rule. gcc/treelang/ 2004-01-20 Kelley Cook * Make-lang.in: Replace $(docdir) with doc. (treelang.info, treelang.srcinfo): New rules. (treelang.man, treelang.man): Dummy entries. maintainer-scripts/ 2004-01-20 Kelley Cook * gcc_release (build_sources): Delete call to make f77.rebuilt. From-SVN: r76249 --- gcc/java/ChangeLog | 6 +++++ gcc/java/Make-lang.in | 70 +++++++++++++++++++++++---------------------------- 2 files changed, 38 insertions(+), 38 deletions(-) (limited to 'gcc/java') diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index e7b4c16..d9027c0 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,5 +1,11 @@ 2004-01-20 Kelley Cook + * Make-lang.in: Replace $(docdir) with doc. + (java.info, java.srcinfo, java.man, java.srcman): New rules. + (java.install-man): Revamp rule. + +2004-01-20 Kelley Cook + * Make-lang.in (JAVA_INSTALL_NAME, JAVA_TARGET_INSTALL_NAME, GCJH_TARGET_INSTALL_NAME): Define via a immediate $(shell) instead of deferred backquote. diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index 00d9270..59f8bc4 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -161,12 +161,19 @@ java.tags: force etags --include TAGS.sub --include ../TAGS.sub -info:: $(docobjdir)/gcj.info -dvi:: $(docobjdir)/gcj.dvi -generated-manpages:: $(docobjdir)/gcj.1 $(docobjdir)/gcjh.1 \ - $(docobjdir)/jv-scan.1 $(docobjdir)/jcf-dump.1 \ - $(docobjdir)/gij.1 $(docobjdir)/jv-convert.1 \ - $(docobjdir)/rmic.1 $(docobjdir)/rmiregistry.1 +java.info: doc/gcj.info + +java.srcinfo: doc/gcj.info + -cp -p $^ $(srcdir)/doc + +dvi:: doc/gcj.dvi +JAVA_MANFILES = doc/gcj.1 doc/gcjh.1 doc/jv-scan.1 doc/jcf-dump.1 doc/gij.1 \ + doc/jv-convert.1 doc/rmic.1 doc/rmiregistry.1 + +java.man: $(JAVA_MANFILES) + +java.srcman: $(JAVA_MANFILES) + -cp -p $^ $(srcdir)/doc check-java : @@ -355,16 +362,15 @@ java/java-tree-inline.o: tree-inline.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(srcdir)/tree-inline.c -o $@ # Documentation -$(docobjdir)/gcj.info: java/gcj.texi $(docdir)/include/fdl.texi \ - $(docdir)/include/gpl.texi $(docdir)/include/gcc-common.texi stmp-docobjdir +doc/gcj.info: java/gcj.texi $(docdir)/include/fdl.texi \ + $(docdir)/include/gpl.texi $(docdir)/include/gcc-common.texi if test "x$(BUILD_INFO)" = xinfo; then \ rm -f doc/gcj.info*; \ $(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir)/include -o $@ $<; \ else true; fi -$(docobjdir)/gcj.dvi: java/gcj.texi $(docdir)/include/fdl.texi \ - $(docdir)/include/gpl.texi $(docdir)/include/gcc-common.texi \ - stmp-docobjdir +doc/gcj.dvi: java/gcj.texi $(docdir)/include/fdl.texi \ + $(docdir)/include/gpl.texi $(docdir)/include/gcc-common.texi $(TEXI2DVI) -I $(docdir)/include -o $@ $< .INTERMEDIATE: gcj.pod gcjh.pod jv-scan.pod jcf-dump.pod gij.pod \ @@ -388,30 +394,18 @@ rmiregistry.pod: java/gcj.texi -$(TEXI2POD) -D rmiregistry < $< > $@ # Install the man pages. -java.install-man: installdirs $(GENERATED_JAVA_MANPAGES) - -if [ -f $(GCJ)$(exeext) ]; then \ - rm -f $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ - $(INSTALL_DATA) $(docobjdir)/gcj.1 $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ - chmod a-x $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ - fi - -rm -f $(DESTDIR)$(man1dir)/gcjh$(man1ext) - -$(INSTALL_DATA) $(docobjdir)/gcjh.1 $(DESTDIR)$(man1dir)/gcjh$(man1ext) - -chmod a-x $(DESTDIR)$(man1dir)/gcjh$(man1ext) - -rm -f $(DESTDIR)$(man1dir)/jv-scan$(man1ext) - -$(INSTALL_DATA) $(docobjdir)/jv-scan.1 $(DESTDIR)$(man1dir)/jv-scan$(man1ext) - -chmod a-x $(DESTDIR)$(man1dir)/jv-scan$(man1ext) - -rm -f $(DESTDIR)$(man1dir)/jcf-dump$(man1ext) - -$(INSTALL_DATA) $(docobjdir)/jcf-dump.1 $(DESTDIR)$(man1dir)/jcf-dump$(man1ext) - -chmod a-x $(DESTDIR)$(man1dir)/jcf-dump$(man1ext) - -rm -f $(DESTDIR)$(man1dir)/gij$(man1ext) - -$(INSTALL_DATA) $(docobjdir)/gij.1 $(DESTDIR)$(man1dir)/gij$(man1ext) - -chmod a-x $(DESTDIR)$(man1dir)/gij$(man1ext) - -rm -f $(DESTDIR)$(man1dir)/jv-convert$(man1ext) - -$(INSTALL_DATA) $(docobjdir)/jv-convert.1 $(DESTDIR)$(man1dir)/jv-convert$(man1ext) - -chmod a-x $(DESTDIR)$(man1dir)/jv-convert$(man1ext) - -rm -f $(DESTDIR)$(man1dir)/rmic$(man1ext) - -$(INSTALL_DATA) $(docobjdir)/rmic.1 $(DESTDIR)$(man1dir)/rmic$(man1ext) - -chmod a-x $(DESTDIR)$(man1dir)/rmic$(man1ext) - -rm -f $(DESTDIR)$(man1dir)/rmiregistry$(man1ext) - -$(INSTALL_DATA) $(docobjdir)/rmiregistry.1 $(DESTDIR)$(man1dir)/rmiregistry$(man1ext) - -chmod a-x $(DESTDIR)$(man1dir)/rmiregistry$(man1ext) +java.install-man: installdirs \ + $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext) \ + $(DESTDIR)$(man1dir)/gcjh$(man1ext) \ + $(DESTDIR)$(man1dir)/jv-scan$(man1ext) \ + $(DESTDIR)$(man1dir)/jcf-dump$(man1ext) \ + $(DESTDIR)$(man1dir)/gij$(man1ext) \ + $(DESTDIR)$(man1dir)/jv-convert$(man1ext) \ + $(DESTDIR)$(man1dir)/jv-convert$(man1ext) \ + $(DESTDIR)$(man1dir)/rmic$(man1ext) \ + $(DESTDIR)$(man1dir)/rmiregistry$(man1ext) + +$(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext): doc/gcj.1 + -rm -f $@ + -$(INSTALL_DATA) $< $@ + -chmod a-x $@ -- cgit v1.1