aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Victal <mirai@makinata.eu>2023-08-21 21:34:02 +0100
committerJonathan Wakely <jwakely@redhat.com>2023-09-07 17:50:46 +0100
commit09c2815dc1665cd1cff96487f2e5bb368ccc3185 (patch)
tree9069403c6f8e25acc19dced9d9584d12d88430c1
parent3b1b24fb2a5a733656ba3ac983e6f7bd0ab307d0 (diff)
downloadgcc-09c2815dc1665cd1cff96487f2e5bb368ccc3185.zip
gcc-09c2815dc1665cd1cff96487f2e5bb368ccc3185.tar.gz
gcc-09c2815dc1665cd1cff96487f2e5bb368ccc3185.tar.bz2
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.
-rw-r--r--libstdc++-v3/doc/Makefile.am4
-rw-r--r--libstdc++-v3/doc/Makefile.in4
2 files changed, 4 insertions, 4 deletions
diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am
index 8371441..373522d 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 21ad855..c19e3e3 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