From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 219393858D20; Thu, 7 Sep 2023 16:54:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 219393858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1694105658; bh=Z06kXx/qGiUC3cTrUgR5V8s17UPAPZvQB5Sef96diTw=; h=From:To:Subject:Date:From; b=TqoiQeRlYPZYu7j6D9t2rc3lH5mPtXbNUIC7gXtO0gnD4xiZkWLG8mPFcNUeNRVLK YtSfq1IytaRkOgxwGzcwnsN82XmuYPQjdKybmLIQLUGya7n6UdZu+77dw9Owf0AE0H JEuHFRpeOCAf3I8xDPM/jW2cVtdGcn3EUw3Fd/w0= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-3789] libstdc++: Fix 'doc-install-info' rule X-Act-Checkin: gcc X-Git-Author: Bruno Victal X-Git-Refname: refs/heads/master X-Git-Oldrev: 3b1b24fb2a5a733656ba3ac983e6f7bd0ab307d0 X-Git-Newrev: 09c2815dc1665cd1cff96487f2e5bb368ccc3185 Message-Id: <20230907165418.219393858D20@sourceware.org> Date: Thu, 7 Sep 2023 16:54:18 +0000 (GMT) List-Id: https://gcc.gnu.org/g:09c2815dc1665cd1cff96487f2e5bb368ccc3185 commit r14-3789-g09c2815dc1665cd1cff96487f2e5bb368ccc3185 Author: Bruno Victal Date: Mon Aug 21 21:34:02 2023 +0100 libstdc++: Fix 'doc-install-info' rule The info manual isn't moved to the expected location after generation which causes the install rule for it to fail. libstdc++-v3/Changelog: * doc/Makefile.am: Fix 'doc-install-info' rule. Fix typo in commment. * doc/Makefile.in: Regenerate. Diff: --- libstdc++-v3/doc/Makefile.am | 4 ++-- libstdc++-v3/doc/Makefile.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am index 8371441c62e1..373522d593d9 100644 --- a/libstdc++-v3/doc/Makefile.am +++ b/libstdc++-v3/doc/Makefile.am @@ -598,7 +598,7 @@ stamp-pdf-docbook: doc-pdf-docbook-pre doc-xml-single-docbook doc-pdf-docbook: stamp-pdf-docbook # TEXINFO, via docbook2X -# NB: Both experimental and tempermental +# NB: Both experimental and temperamental manual_texi = ${docbook_outdir}/texinfo/libstdc++-manual.texi manual_info = ${docbook_outdir}/texinfo/libstdc++-manual.info DB2TEXI_FLAGS = \ @@ -615,7 +615,7 @@ stamp-texinfo-docbook: stamp-xml-single-docbook ${docbook_outdir}/texinfo stamp-info-docbook: stamp-texinfo-docbook @echo "Generating info files..." - $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi} + $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi} -o ${manual_info} $(STAMP) stamp-info-docbook doc-texinfo-docbook: stamp-texinfo-docbook diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in index 21ad8557f7a8..c19e3e3044c8 100644 --- a/libstdc++-v3/doc/Makefile.in +++ b/libstdc++-v3/doc/Makefile.in @@ -645,7 +645,7 @@ manual_pdf = ${docbook_outdir}/pdf/libstdc++-manual.pdf DBLATEX_FLAGS = --verbose --pdf --dump --debug --tmpdir=${docbook_outdir}/latex # TEXINFO, via docbook2X -# NB: Both experimental and tempermental +# NB: Both experimental and temperamental manual_texi = ${docbook_outdir}/texinfo/libstdc++-manual.texi manual_info = ${docbook_outdir}/texinfo/libstdc++-manual.info DB2TEXI_FLAGS = \ @@ -1096,7 +1096,7 @@ stamp-texinfo-docbook: stamp-xml-single-docbook ${docbook_outdir}/texinfo stamp-info-docbook: stamp-texinfo-docbook @echo "Generating info files..." - $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi} + $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi} -o ${manual_info} $(STAMP) stamp-info-docbook doc-texinfo-docbook: stamp-texinfo-docbook