From patchwork Tue Jan 10 05:07:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 62881 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 B63CE3858413 for ; Tue, 10 Jan 2023 05:08:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B63CE3858413 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673327294; bh=4axjSNl9z4V2bYFIkC++7b59xIp0g9fGCZ525S7tLBQ=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=YqkOL455jhNVDpr5cikmQzhVMTNpVvDFjY8X0HfDRaDztDW9X3L5n+y9qorxi8jWM 5+DE7wzImGVkvkuKWWmhLbLRNhetl6Xmv6sFP7+PNegFAGzroYOPayc/ULFh3q3NCu cqvFInIzu9ZcoPkiz1Sl4z3mU8mB6h7aVoyIxeMI= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 04E1B3858CDB for ; Tue, 10 Jan 2023 05:07:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 04E1B3858CDB Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 30A57QBg023221 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 10 Jan 2023 00:07:31 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 30A57QBg023221 Received: from simark.localdomain (unknown [217.28.27.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 322A61E112; Tue, 10 Jan 2023 00:07:26 -0500 (EST) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH] gdb/doc: fix install-html with Texinfo 7 Date: Tue, 10 Jan 2023 00:07:25 -0500 Message-Id: <20230110050725.1768197-1-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Tue, 10 Jan 2023 05:07:26 +0000 X-Spam-Status: No, score=-3189.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Starting with Texinfo 7 (this commit [1]), the output directory for the HTML doc format is gdb/doc/gdb_html, rather than gdb/doc/gdb previously. This breaks the install-html target, which expects the HTML doc to be in gdb/doc/gdb: $ make install-html MAKEINFO=makeinfo DESTDIR=/tmp/install make[1]: Entering directory '/home/simark/build/binutils-gdb/gdb' make[2]: Entering directory '/home/simark/build/binutils-gdb/gdb/doc' makeinfo -DHAVE_MAKEINFO_CLICK --html -I /home/simark/src/binutils-gdb/gdb/doc/../../readline/readline/doc -I /home/simark/src/binutils-gdb/gdb/doc/../mi -I /home/simark/src/binutils-gdb/gdb/doc /home/simark/src/binutils-gdb/gdb/doc/gdb.texinfo makeinfo -DHAVE_MAKEINFO_CLICK --html -I /home/simark/src/binutils-gdb/gdb/doc /home/simark/src/binutils-gdb/gdb/doc/stabs.texinfo makeinfo -DHAVE_MAKEINFO_CLICK --html -I /home/simark/src/binutils-gdb/gdb/doc /home/simark/src/binutils-gdb/gdb/doc/annotate.texinfo test -z "/usr/local/share/doc/gdb" || /bin/sh /home/simark/src/binutils-gdb/gdb/doc/../../mkinstalldirs "/tmp/install/usr/local/share/doc/gdb" /usr/bin/install -c -m 644 '/home/simark/src/binutils-gdb/gdb/doc/gdb' '/tmp/install/usr/local/share/doc/gdb/gdb' /usr/bin/install: cannot stat '/home/simark/src/binutils-gdb/gdb/doc/gdb': No such file or directory /usr/bin/install -c -m 644 '/home/simark/src/binutils-gdb/gdb/doc/stabs' '/tmp/install/usr/local/share/doc/gdb/stabs' /usr/bin/install: cannot stat '/home/simark/src/binutils-gdb/gdb/doc/stabs': No such file or directory /usr/bin/install -c -m 644 '/home/simark/src/binutils-gdb/gdb/doc/annotate' '/tmp/install/usr/local/share/doc/gdb/annotate' /usr/bin/install: cannot stat '/home/simark/src/binutils-gdb/gdb/doc/annotate': No such file or directory make[2]: *** [Makefile:278: install-html] Error 1 make[2]: Leaving directory '/home/simark/build/binutils-gdb/gdb/doc' make[1]: *** [Makefile:2240: subdir_do] Error 1 make[1]: Leaving directory '/home/simark/build/binutils-gdb/gdb' make: *** [Makefile:2006: install-html] Error 2 Fix this by adding -o switches to the HTML targets, to force the output directories. [1] https://git.savannah.gnu.org/cgit/texinfo.git/commit/?id=a868421baf9c44227c43490687f8d6b8d6c95414 Change-Id: Ie147dc7b4a52eb2348005b8dc006a41b0784621f --- gdb/doc/Makefile.in | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) base-commit: 7dd38e31d67c2548b52bea313ab18e40824c05da diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in index d1012bee98c9..5d40aa229b21 100644 --- a/gdb/doc/Makefile.in +++ b/gdb/doc/Makefile.in @@ -564,7 +564,10 @@ gdb.mm: $(GDB_DOC_FILES) links2roff # GDB MANUAL: HTML file gdb/index.html: ${GDB_DOC_FILES} - $(MAKEHTML) $(MAKEHTMLFLAGS) $(READLINE_TEXI_INCFLAG) -I ${GDBMI_DIR} -I $(srcdir) $(srcdir)/gdb.texinfo + $(MAKEHTML) $(MAKEHTMLFLAGS) \ + -o gdb \ + $(READLINE_TEXI_INCFLAG) -I ${GDBMI_DIR} -I $(srcdir) \ + $(srcdir)/gdb.texinfo stabs.info: $(STABS_DOC_FILES) $(MAKEINFO_CMD) -I $(srcdir) -o stabs.info $(srcdir)/stabs.texinfo @@ -572,7 +575,10 @@ stabs.info: $(STABS_DOC_FILES) # STABS DOCUMENTATION: HTML file stabs/index.html: $(STABS_DOC_FILES) - $(MAKEHTML) $(MAKEHTMLFLAGS) -I $(srcdir) $(srcdir)/stabs.texinfo + $(MAKEHTML) $(MAKEHTMLFLAGS) \ + -o stabs \ + -I $(srcdir) \ + $(srcdir)/stabs.texinfo # Clean these up before each run. Avoids a catch 22 with not being # able to re-generate these files (to fix a corruption) because these @@ -614,7 +620,10 @@ annotate.info: $(ANNOTATE_DOC_FILES) $(MAKEINFO_CMD) -I $(srcdir) -o annotate.info $(srcdir)/annotate.texinfo annotate/index.html: $(ANNOTATE_DOC_FILES) - $(MAKEHTML) $(MAKEHTMLFLAGS) -I $(srcdir) $(srcdir)/annotate.texinfo + $(MAKEHTML) $(MAKEHTMLFLAGS) \ + -o annotate \ + -I $(srcdir) \ + $(srcdir)/annotate.texinfo # Man pages gdb.1: $(GDB_DOC_FILES)