From patchwork Wed Nov 30 21:42:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Buclaw X-Patchwork-Id: 61283 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5AE10385842E for ; Wed, 30 Nov 2022 21:43:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5AE10385842E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669844586; bh=nSN2YpWdPYxvwNJgQH4LTdG/tbJdRjcSWY4XuZ3or+o=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=IQPCVBgekhTwq9jlQUnq4M9vwfj6NRikVONrElXNIVRRoMVJcd856DHvy2zLgCqx2 lMc7TTzM2svrFU1Q2Mc/k6gToLiUQk9RvIqq0u0DoaGSo8yFtcxbYtU9b+v56j7aUS 6AuDokeHXNesB/9IAuT1htOd4v1yKNwKbe+isVnU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [IPv6:2001:67c:2050:0:465::102]) by sourceware.org (Postfix) with ESMTPS id 846683858D1E for ; Wed, 30 Nov 2022 21:42:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 846683858D1E Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4NMt3J5sTZz9sV1; Wed, 30 Nov 2022 22:42:36 +0100 (CET) To: gcc-patches@gcc.gnu.org Cc: Iain Buclaw Subject: [committed] d: Update recipes for building html and pdf documentation Date: Wed, 30 Nov 2022 22:42:34 +0100 Message-Id: <20221130214234.550547-1-ibuclaw@gdcproject.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4NMt3J5sTZz9sV1 X-Spam-Status: No, score=-13.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Iain Buclaw via Gcc-patches From: Iain Buclaw Reply-To: Iain Buclaw Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" 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 \