This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[Patch,java] Fix bootstrap building gcj.info


I was trying to bootstrap c,c++,java on i686-pc-linux-gnu (Fedora Core 6), and makeinfo failed building gcj.info because it could not find gcc-vers.texi.

The fix is to add $(gcc_docdir) to the include path as is done in gcc/Makefile.in.

I am not sure why I am seeing this failure now. I bootstrap with java on several different platforms and have never seen it before.

Bootstrapped on i686-pc-linux-gnu.

OK to commit?

2007-06-24 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.

Index: java/Make-lang.in
===================================================================
--- java/Make-lang.in	(revision 125997)
+++ java/Make-lang.in	(working copy)
@@ -318,19 +318,21 @@
 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

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]