texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/Texinfo/XS/convert/converter.c (setup_conver


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/XS/convert/converter.c (setup_converter_paths_information): allow pkgdatadir to be unset.
Date: Thu, 03 Oct 2024 14:14:25 -0400

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 313cc55ede * tp/Texinfo/XS/convert/converter.c 
(setup_converter_paths_information): allow pkgdatadir to be unset.
313cc55ede is described below

commit 313cc55ede73715df748fe43ee14a7d82a2f791c
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Aug 7 17:56:22 2024 +0200

    * tp/Texinfo/XS/convert/converter.c
    (setup_converter_paths_information): allow pkgdatadir to be unset.
---
 ChangeLog                         | 5 +++++
 tp/Texinfo/XS/convert/converter.c | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f785d2f4bb..072857181d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
        * tp/Texinfo/XS/main/get_perl_info.h: declare html_fill_sv_options and
        html_fill_button_sv_specification_list.
 
+2024-08-07  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/converter.c
+       (setup_converter_paths_information): allow pkgdatadir to be unset.
+
 2024-08-07  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/main/utils.c (initialize_options_list),
diff --git a/tp/Texinfo/XS/convert/converter.c 
b/tp/Texinfo/XS/convert/converter.c
index 379688c9d0..a4e7efe2f5 100644
--- a/tp/Texinfo/XS/convert/converter.c
+++ b/tp/Texinfo/XS/convert/converter.c
@@ -37,6 +37,8 @@
 #include "tree_types.h"
 #include "option_types.h"
 #include "options_types.h"
+#include "document_types.h"
+#include "converter_types.h"
 #include "converters_defaults.h"
 #include "tree.h"
 #include "extra.h"
@@ -126,8 +128,11 @@ setup_converter_paths_information (int texinfo_uninstalled,
           = strdup (top_srcdir);
     }
   else
-    conversion_paths_info.p.installed.pkgdatadir
-      = strdup (pkgdatadir);
+    {
+      if (pkgdatadir)
+        conversion_paths_info.p.installed.pkgdatadir
+          = strdup (pkgdatadir);
+    }
 }
 
 /* called only once */



reply via email to

[Prev in Thread] Current Thread [Next in Thread]