From: Bruno Victal <mirai@makinata.eu>
Date: Mon, 21 Aug 2023 20:34:02 +0000 (+0100)
Subject: libstdc++: Fix 'doc-install-info' rule
X-Git-Tag: basepoints/gcc-15~6350
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09c2815dc1665cd1cff96487f2e5bb368ccc3185;p=thirdparty%2Fgcc.git

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 --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