aboutsummaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
authorMike Stump <mrs@apple.com>2006-06-06 10:15:12 +0000
committerMike Stump <mrs@gcc.gnu.org>2006-06-06 10:15:12 +0000
commit22482f746bf6341908d4e1f9ee340f7c8f51fe8d (patch)
tree969d520cd8cfa471e657aa26b4e560d0e4e47147 /gcc/java
parentbb83aa4befca7648dc4cf75c1fe33130cdfb512d (diff)
downloadgcc-22482f746bf6341908d4e1f9ee340f7c8f51fe8d.zip
gcc-22482f746bf6341908d4e1f9ee340f7c8f51fe8d.tar.gz
gcc-22482f746bf6341908d4e1f9ee340f7c8f51fe8d.tar.bz2
Makefile.in: Rename to htmldir to build_htmldir to avoid installing during build.
* Makefile.in: Rename to htmldir to build_htmldir to avoid installing during build. java,fortran: * Make-lang.in: Rename to htmldir to build_htmldir to avoid installing during build. treelang: * Make-lang.in: Rename to gcc_htmldir to build_htmldir to avoid installing during build. From-SVN: r114426
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/Make-lang.in4
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index d0b65ae..47104e9 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-06 Mike Stump <mrs@apple.com>
+
+ * Make-lang.in: Rename to htmldir to build_htmldir to avoid
+ installing during build.
+
2006-05-31 Thomas Fitzsimmons <fitzsim@redhat.com>
* gcj.texi (Extensions): Document the new gcj-dbtool-based
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 1a6d5be..1d5a461 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -177,7 +177,7 @@ java.srcinfo: doc/gcj.info
-cp -p $^ $(srcdir)/doc
java.dvi: doc/gcj.dvi
-java.html: $(htmldir)/java/index.html
+java.html: $(build_htmldir)/java/index.html
JAVA_MANFILES = doc/gcj.1 doc/gcjh.1 doc/jv-scan.1 doc/jcf-dump.1 doc/gij.1 \
doc/jv-convert.1 doc/grmic.1 doc/grmiregistry.1 \
doc/gcj-dbtool.1 doc/gjnih.1
@@ -394,7 +394,7 @@ doc/gcj.info: $(TEXI_JAVA_FILES)
doc/gcj.dvi: $(TEXI_JAVA_FILES)
$(TEXI2DVI) -I $(abs_docdir)/include -o $@ $<
-$(htmldir)/java/index.html: $(TEXI_JAVA_FILES)
+$(build_htmldir)/java/index.html: $(TEXI_JAVA_FILES)
$(mkinstalldirs) $(@D)
rm -f $(@D)/*
$(TEXI2HTML) -I $(gcc_docdir)/include -I $(srcdir)/java -o $(@D) $<