d: Update recipes for building html and pdf documentation

gcc/d/ChangeLog:

	* Make-lang.in: Only include doc/include when building documentation.
	(d.html): Rename html directory to $(build_htmldir)/gdc.

diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in
index 984b1d6..144d5b8 100644 (file)
--- a/gcc/d/Make-lang.in
+++ b/gcc/d/Make-lang.in
@@ -252,16 +252,15 @@ doc/gdc.info: $(D_TEXI_FILES)
        else true; fi
 
 doc/gdc.dvi: $(D_TEXI_FILES)
-       $(TEXI2DVI) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
+       $(TEXI2DVI) -I $(abs_docdir)/include -o $@ $<
 
 doc/gdc.pdf: $(D_TEXI_FILES)
-       $(TEXI2PDF) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
+       $(TEXI2PDF) -I $(abs_docdir)/include -o $@ $<
 
-$(build_htmldir)/d/index.html: $(D_TEXI_FILES)
+$(build_htmldir)/gdc/index.html: $(D_TEXI_FILES)
        $(mkinstalldirs) $(@D)
        rm -f $(@D)/*
-       $(TEXI2HTML) -I $(gcc_docdir) -I $(gcc_docdir)/include \
-               -I $(srcdir)/d -o $(@D) $<
+       $(TEXI2HTML) -I $(gcc_docdir)/include -I $(srcdir)/d -o $(@D) $<
 
 .INTERMEDIATE: gdc.pod
 
@@ -276,7 +275,7 @@ d.rest.encap:
 d.info: doc/gdc.info
 d.dvi: doc/gdc.dvi
 d.pdf: doc/gdc.pdf
-d.html: $(build_htmldir)/d/index.html
+d.html: $(build_htmldir)/gdc/index.html
 d.srcinfo: doc/gdc.info
        -cp -p $^ $(srcdir)/doc
 d.srcextra:
@@ -340,10 +339,10 @@ d.install-dvi: doc/gdc.dvi
          $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/gcc/$$f"; \
        done
 
-d.install-html: $(build_htmldir)/d
+d.install-html: $(build_htmldir)/gdc
        @$(NORMAL_INSTALL)
        test -z "$(htmldir)" || $(mkinstalldirs) "$(DESTDIR)$(htmldir)"
-       @for p in $(build_htmldir)/d; do \
+       @for p in $(build_htmldir)/gdc; do \
          if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \
          f=$(html__strip_dir) \
          if test -d "$$d$$p"; then \