[committed] d: Update recipes for building html and pdf documentation

[committed] d: Update recipes for building html and pdf documentation

[Iain Buclaw]

Hi,

This patch sorts out the include directories for building the gdc docs -
we don't need to include anything from the toplevel docs directory.

The html output directory has also been renamed from /d/ to /gdc/ to
make it clearer that this is vendor-specific documentation.

Tested by building and checking pdf/info/man/html pages, and committed
to mainline.

Regards,
Iain.

---
gcc/d/ChangeLog:

	* Make-lang.in: Only include doc/include when building documentation.
	(d.html): Rename html directory to $(build_htmldir)/gdc.
---
 gcc/d/Make-lang.in | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in
index 28313208ec9..b5264613db0 100644
--- a/gcc/d/Make-lang.in
+++ b/gcc/d/Make-lang.in
@@ -253,16 +253,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
 
@@ -277,7 +276,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:
@@ -341,10 +340,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 \
-- 
2.37.2