Make-lang.in (doc/gcj.info): Add $(gcc_docdir) to include path.

	* java/Make-lang.in (doc/gcj.info): Add $(gcc_docdir) to
	include path.
	(doc/gcj.dvi): Same.
	(doc/gcj.pdf): Same.
	(java/index.html): Same.

From-SVN: r126275

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 493fe1ed839e43182a0f48fa137af6c03a48ca4e..87a01133a4aaa499647ae287ad2e22b507bd982a 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-03  David Daney  <ddaney@avtrex.com>
+
+       * java/Make-lang.in (doc/gcj.info): Add $(gcc_docdir) to 
+       include path.
+       (doc/gcj.dvi): Same.
+       (doc/gcj.pdf): Same.
+       (java/index.html): Same.
+
 2007-06-15 Andrew Pinski  <andrew_pinski@playstation.sony.com>
 
        * class.c (make_class_data): Build the index in sizetype.

diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 00b0e06631bfb594b94f45e3ff6d0ad6ce40d98a..99b3d4203096fe8e58b26c825c79ea8a28658633 100644 (file)
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -318,19 +318,21 @@ TEXI_JAVA_FILES = java/gcj.texi $(gcc_docdir)/include/fdl.texi            \
 doc/gcj.info: $(TEXI_JAVA_FILES)
        if test "x$(BUILD_INFO)" = xinfo; then \
          rm -f doc/gcj.info*; \
-         $(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir)/include -o $@ $<; \
+         $(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \
+               -I $(gcc_docdir)/include -o $@ $<; \
        else true; fi
 
 doc/gcj.dvi: $(TEXI_JAVA_FILES)
-       $(TEXI2DVI) -I $(abs_docdir)/include -o $@ $<
+       $(TEXI2DVI) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
 
 doc/gcj.pdf: $(TEXI_JAVA_FILES)
-       $(TEXI2PDF) -I $(abs_docdir)/include -o $@ $<
+       $(TEXI2PDF) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
 
 $(build_htmldir)/java/index.html: $(TEXI_JAVA_FILES)
        $(mkinstalldirs) $(@D)
        rm -f $(@D)/*
-       $(TEXI2HTML) -I $(gcc_docdir)/include -I $(srcdir)/java -o $(@D) $<
+       $(TEXI2HTML) -I $(gcc_docdir) -I $(gcc_docdir)/include \
+               -I $(srcdir)/java -o $(@D) $<
 
 .INTERMEDIATE: gcj.pod jcf-dump.pod gij.pod \
   jv-convert.pod grmic.pod gcj-dbtool.pod gc-analyze.pod