[PATCH 0/2] libstdc++: Documentation fixes.

[PATCH 0/2] libstdc++: Documentation fixes.

[Bruno Victal]

This small patch-series fixes the 'doc-install-info' rule
and updates the URI used for docbook-xsl.

Bruno Victal (2):
  libstdc++: Fix 'doc-install-info' rule.
  libstdc++: Update docbook xsl URI.

 libstdc++-v3/acinclude.m4    | 2 +-
 libstdc++-v3/doc/Makefile.am | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


base-commit: f9ff6fa58217294d63f255dd02abfcc8a074f509
-- 
2.40.1

[PATCH 1/2] libstdc++: Fix 'doc-install-info' rule.

[Bruno Victal]

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.in: Regenerate.
	* doc/Makefile.am: Fix 'doc-install-info' rule.
	Fix typo in commment.
---
 libstdc++-v3/doc/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am
index 8371441c62e..373522d593d 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

base-commit: f9ff6fa58217294d63f255dd02abfcc8a074f509
-- 
2.40.1

[PATCH 2/2] libstdc++: Update docbook xsl URI.

[Bruno Victal]

The URI for namespaced docbook-xsl was updated to reflect the current
DocBook upstream at <https://cdn.docbook.org/>.

libstdc++-v3/Changelog:
        * acinclude.m4: Update docbook xsl URI.
	* configure: Regenerate.
---
 libstdc++-v3/acinclude.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index b25378eaace..152811fd00d 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -604,7 +604,7 @@ dnl  XSL_STYLE_DIR
 dnl
 AC_DEFUN([GLIBCXX_CONFIGURE_DOCBOOK], [
 
-glibcxx_docbook_url=http://docbook.sourceforge.net/release/xsl-ns/current/
+glibcxx_docbook_url=http://cdn.docbook.org/release/xsl/current/
 
 AC_MSG_CHECKING([for local stylesheet directory])
 glibcxx_local_stylesheets=no
-- 
2.40.1

Re: [PATCH 0/2] libstdc++: Documentation fixes.

[Jonathan Wakely]

[-- Attachment #1: Type: text/plain, Size: 537 bytes --]

On Mon, 21 Aug 2023, 21:33 Bruno Victal, <mirai@makinata.eu> wrote:

> This small patch-series fixes the 'doc-install-info' rule
> and updates the URI used for docbook-xsl.
>

Thanks! I'll get these committed tomorrow.



> Bruno Victal (2):
>   libstdc++: Fix 'doc-install-info' rule.
>   libstdc++: Update docbook xsl URI.
>
>  libstdc++-v3/acinclude.m4    | 2 +-
>  libstdc++-v3/doc/Makefile.am | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
>
> base-commit: f9ff6fa58217294d63f255dd02abfcc8a074f509
> --
> 2.40.1
>
>

Re: [PATCH 0/2] libstdc++: Documentation fixes.

[Jonathan Wakely]

On Mon, 21 Aug 2023 at 21:40, Jonathan Wakely <jwakely.gcc@gmail.com> wrote:
>
>
>
> On Mon, 21 Aug 2023, 21:33 Bruno Victal, <mirai@makinata.eu> wrote:
>>
>> This small patch-series fixes the 'doc-install-info' rule
>> and updates the URI used for docbook-xsl.
>
>
> Thanks! I'll get these committed tomorrow.

It took a little longer than that, but I've pushed them now - thanks again.


>
>
>>
>> Bruno Victal (2):
>>   libstdc++: Fix 'doc-install-info' rule.
>>   libstdc++: Update docbook xsl URI.
>>
>>  libstdc++-v3/acinclude.m4    | 2 +-
>>  libstdc++-v3/doc/Makefile.am | 4 ++--
>>  2 files changed, 3 insertions(+), 3 deletions(-)
>>
>>
>> base-commit: f9ff6fa58217294d63f255dd02abfcc8a074f509
>> --
>> 2.40.1
>>