Make-lang.in ($(srcdir)/java/gcj.info): Added dependencies on fdl.texi.

* Make-lang.in ($(srcdir)/java/gcj.info): Added dependencies on
fdl.texi.
(java/gcj.dvi): Use TEXI2DVI instead of custom tex calls.  Create
the dvi file in the java directory.

From-SVN: r42658

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index ff098e71529738abb23deaf40d24183255693538..70a50eb4eaec6efdfd57a18c8808c706fc7700b8 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-23  Theodore Papadopoulo  <Theodore.Papadopoulo@sophia.inria.fr>
+
+       * Make-lang.in ($(srcdir)/java/gcj.info): Added dependencies on
+       fdl.texi.
+       (java/gcj.dvi): Use TEXI2DVI instead of custom tex calls.  Create
+       the dvi file in the java directory.
+
 2001-05-25  Sam TH  <sam@uchicago.edu>
 
        * gen-table.pl javaop.h jcf.h lex.h,

diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index a2a73bc8fe8231d084adfbcb2d85a808d062e043..2737f93292f2e23a22573f653d51fa6976a1b072 100644 (file)
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -293,13 +293,12 @@ java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) java/jcf.h
          $(srcdir)/java/jcf-path.c $(OUTPUT_OPTION)
 
 # Documentation
-$(srcdir)/java/gcj.info: $(srcdir)/java/gcj.texi
+$(srcdir)/java/gcj.info: $(srcdir)/java/gcj.texi $(srcdir)/fdl.texi
        if test "x$(BUILD_INFO)" = xinfo; then \
          rm -f $(srcdir)/java/gcc.info*; \
          cd $(srcdir)/java && $(MAKEINFO) -I.. -o gcj.info gcj.texi; \
        else true; fi
 
-java/gcj.dvi: $(srcdir)/java/gcj.texi
-       TEXINPUTS=${texidir}:$(srcdir)/java:$(srcdir):$$TEXINPUTS tex gcj.texi
-       texindex gcj.??
-       TEXINPUTS=${texidir}:$(srcdir)/java:$(srcdir):$$TEXINPUTS tex gcj.texi
+java/gcj.dvi: $(srcdir)/java/gcj.texi $(srcdir)/fdl.texi
+       s=`cd $(srcdir); pwd`; export s; \
+       cd java && $(TEXI2DVI) -I $$s $$s/java/gcj.texi