From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1873) id 6AC6B385B503; Wed, 30 Nov 2022 21:41:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6AC6B385B503 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669844503; bh=DbnoYB8cJ7avUyVqOj6hq+/iTO6Ku+BT3krjm/SkqQ8=; h=From:To:Subject:Date:From; b=G/qV/6Tinj7kxwietLCRDzDXL82WoO15ImSWGLG3UfksjKXERoDRPQK+5aAfUeDze h8QrbFucs9K84/vc1o2fDSohOqZxHjX92FEU1AF53eJ/usE5pYlWvSfaJZpnUuwC4W 3M/yE/9BPu0Ea//g3F7sLR8WfkAJKhE+BOwyclV0= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Iain Buclaw To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-4419] d: Update recipes for building html and pdf documentation X-Act-Checkin: gcc X-Git-Author: Iain Buclaw X-Git-Refname: refs/heads/master X-Git-Oldrev: 0f2f30f9ee051b1d50122412d139f56ae096113b X-Git-Newrev: 7870100db7b755e5916144e569e80cfa19e361eb Message-Id: <20221130214143.6AC6B385B503@sourceware.org> Date: Wed, 30 Nov 2022 21:41:43 +0000 (GMT) List-Id: https://gcc.gnu.org/g:7870100db7b755e5916144e569e80cfa19e361eb commit r13-4419-g7870100db7b755e5916144e569e80cfa19e361eb Author: Iain Buclaw Date: Wed Nov 30 18:01:25 2022 +0100 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: --- 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 984b1d63dcb..144d5b88483 100644 --- 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 \