From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id B86AD3858D35; Wed, 11 Jan 2023 22:30:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B86AD3858D35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673476229; bh=dV5LuSnEGahlWnnpqFc5OPtWDbnD04Pz0ZgX1aKOjW4=; h=From:To:Subject:Date:From; b=dLmfzZI/viHTQPKXtATejpqgQk35P5uJeAkL6ViPjSGkjr4LzjQ4ccMUaOxWsgpZb 420s7hcR7SEszFxlbHzp280/VEgQlyFr0/FIkI9w61dcajbAQpoHfo+EHpC01JBVwP h6M4xuKuLXWGXgVRCFKnpX/Gepmd9ASnA/9kbpLg= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Simon Marchi To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb/doc: fix install-html with Texinfo 7 X-Act-Checkin: binutils-gdb X-Git-Author: Simon Marchi X-Git-Refname: refs/heads/master X-Git-Oldrev: 6be354acf31c8007450114ad5ec64341a4afb608 X-Git-Newrev: 7bd836d5d90353a2de192fd4711a20b4520246b7 Message-Id: <20230111223029.B86AD3858D35@sourceware.org> Date: Wed, 11 Jan 2023 22:30:29 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D7bd836d5d903= 53a2de192fd4711a20b4520246b7 commit 7bd836d5d90353a2de192fd4711a20b4520246b7 Author: Simon Marchi Date: Tue Jan 10 00:07:25 2023 -0500 gdb/doc: fix install-html with Texinfo 7 =20 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: =20 $ make install-html MAKEINFO=3Dmakeinfo DESTDIR=3D/tmp/install make[1]: Entering directory '/home/simark/build/binutils-gdb/gdb' make[2]: Entering directory '/home/simark/build/binutils-gdb/gdb/do= c' makeinfo -DHAVE_MAKEINFO_CLICK --html -I /home/simark/src/binutil= s-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/bin= utils-gdb/gdb/doc/gdb.texinfo makeinfo -DHAVE_MAKEINFO_CLICK --html -I /home/simark/src/binutil= s-gdb/gdb/doc /home/simark/src/binutils-gdb/gdb/doc/stabs.texinfo makeinfo -DHAVE_MAKEINFO_CLICK --html -I /home/simark/src/binutil= s-gdb/gdb/doc /home/simark/src/binutils-gdb/gdb/doc/annotate.texinfo test -z "/usr/local/share/doc/gdb" || /bin/sh /home/simark/src/binu= tils-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/do= c/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/do= c/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/do= c/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 =20 Fix this by adding -o switches to the HTML targets, to force the output directories. =20 [1] https://git.savannah.gnu.org/cgit/texinfo.git/commit/?id=3Da868421b= af9c44227c43490687f8d6b8d6c95414 =20 Change-Id: Ie147dc7b4a52eb2348005b8dc006a41b0784621f Diff: --- gdb/doc/Makefile.in | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in index d1012bee98c..5d40aa229b2 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 =20 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 =20 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 =20 stabs/index.html: $(STABS_DOC_FILES) - $(MAKEHTML) $(MAKEHTMLFLAGS) -I $(srcdir) $(srcdir)/stabs.texinfo + $(MAKEHTML) $(MAKEHTMLFLAGS) \ + -o stabs \ + -I $(srcdir) \ + $(srcdir)/stabs.texinfo =20 # 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 =20 annotate/index.html: $(ANNOTATE_DOC_FILES) - $(MAKEHTML) $(MAKEHTMLFLAGS) -I $(srcdir) $(srcdir)/annotate.texinfo + $(MAKEHTML) $(MAKEHTMLFLAGS) \ + -o annotate \ + -I $(srcdir) \ + $(srcdir)/annotate.texinfo =20 # Man pages gdb.1: $(GDB_DOC_FILES)