diff options
| author | Carlos O'Donell <carlos@gcc.gnu.org> | 2006-03-30 20:20:10 +0000 |
|---|---|---|
| committer | Carlos O'Donell <carlos@gcc.gnu.org> | 2006-03-30 20:20:10 +0000 |
| commit | ad3a7ce375e2ae78eed1b293c6c0f93b024b9c35 (patch) | |
| tree | fcb6e4e39fa9003753a7a0bcd5bf75e0cf9c14af /gcc/java | |
| parent | 79edfde8fb072da763bb08da00ed109a23311f17 (diff) | |
| download | gcc-ad3a7ce375e2ae78eed1b293c6c0f93b024b9c35.zip gcc-ad3a7ce375e2ae78eed1b293c6c0f93b024b9c35.tar.gz gcc-ad3a7ce375e2ae78eed1b293c6c0f93b024b9c35.tar.bz2 | |
Makefile.in: Rename docdir to gcc_docdir.
gcc/
2006-03-30 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.in: Rename docdir to gcc_docdir.
gcc/java/
2006-03-30 Carlos O'Donell <carlos@codesourcery.com>
* Make-lang.in: Rename docdir to gcc_docdir.
gcc/ada/
2006-03-29 Carlos O'Donell <carlos@codesourcery.com>
* Make-lang.in: Rename docdir to gcc_docdir.
gcc/fortran/
2006-03-29 Carlos O'Donell <carlos@codesourcery.com>
* Make-lang.in: Rename docdir to gcc_docdir.
gcc/treelang/
2006-03-29 Carlos O'Donell <caros@codesourcery.com>
* Make-lang.in: Rename docdir to gcc_docdir.
From-SVN: r112545
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/java/Make-lang.in | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 64fea4a..6d705fb 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,7 @@ +2006-03-30 Carlos O'Donell <carlos@codesourcery.com> + + * Make-lang.in: Rename docdir to gcc_docdir. + 2006-03-30 Tom Tromey <tromey@redhat.com> PR java/26042: diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index 96ca2d2..c3393d2 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -380,15 +380,15 @@ java/gjavah-jni.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(JAVA_TREE_H) \ -DJNI_DEFAULT=1 \ $(srcdir)/java/gjavah.c $(OUTPUT_OPTION) -TEXI_JAVA_FILES = java/gcj.texi $(docdir)/include/fdl.texi \ - $(docdir)/include/gpl.texi $(docdir)/include/gcc-common.texi \ +TEXI_JAVA_FILES = java/gcj.texi $(gcc_docdir)/include/fdl.texi \ + $(gcc_docdir)/include/gpl.texi $(gcc_docdir)/include/gcc-common.texi \ gcc-vers.texi # Documentation doc/gcj.info: $(TEXI_JAVA_FILES) if test "x$(BUILD_INFO)" = xinfo; then \ rm -f doc/gcj.info*; \ - $(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir)/include -o $@ $<; \ + $(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir)/include -o $@ $<; \ else true; fi doc/gcj.dvi: $(TEXI_JAVA_FILES) @@ -397,7 +397,7 @@ doc/gcj.dvi: $(TEXI_JAVA_FILES) $(htmldir)/java/index.html: $(TEXI_JAVA_FILES) $(mkinstalldirs) $(@D) rm -f $(@D)/* - $(TEXI2HTML) -I $(docdir)/include -I $(srcdir)/java -o $(@D) $< + $(TEXI2HTML) -I $(gcc_docdir)/include -I $(srcdir)/java -o $(@D) $< .INTERMEDIATE: gcj.pod gcjh.pod jv-scan.pod jcf-dump.pod gij.pod \ jv-convert.pod grmic.pod grmiregistry.pod gcj-dbtool.pod gjnih.pod |