branch master updated: * tp/Makefile.am (EXTRA_DIST), tp/Texinfo/XS/Makefile.am, tp/Texinfo/command_data.txt: move command_data.txt from tp/Texinfo/XS/ to tp/Texinfo/ since it is now used both in perl modules and in the XS parser.

[Patrice Dumas]

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 575f544b4b * tp/Makefile.am (EXTRA_DIST), tp/Texinfo/XS/Makefile.am, 
tp/Texinfo/command_data.txt: move command_data.txt from tp/Texinfo/XS/ to 
tp/Texinfo/ since it is now used both in perl modules and in the XS parser.
575f544b4b is described below

commit 575f544b4badc402d79663c17d09a3945ad904e4
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Nov 13 21:40:21 2022 +0100

    * tp/Makefile.am (EXTRA_DIST), tp/Texinfo/XS/Makefile.am,
    tp/Texinfo/command_data.txt: move command_data.txt from
    tp/Texinfo/XS/ to tp/Texinfo/ since it is now used both in perl
    modules and in the XS parser.
---
 ChangeLog                                      | 7 +++++++
 tp/Makefile.am                                 | 7 ++++---
 tp/Texinfo/XS/Makefile.am                      | 6 +++---
 tp/Texinfo/{XS/parsetexi => }/command_data.txt | 0
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ed04852ba5..20c464dc4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-11-13  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Makefile.am (EXTRA_DIST), tp/Texinfo/XS/Makefile.am,
+       tp/Texinfo/command_data.txt: move command_data.txt from
+       tp/Texinfo/XS/ to tp/Texinfo/ since it is now used both in perl
+       modules and in the XS parser.
+
 2022-11-13  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Makefile.am (test_files): add t/init/*.pm files.
diff --git a/tp/Makefile.am b/tp/Makefile.am
index 5a1685e2b2..944621940f 100644
--- a/tp/Makefile.am
+++ b/tp/Makefile.am
@@ -300,7 +300,8 @@ EXTRA_DIST = \
   $(test_files) \
   $(tp_tests) \
   $(maintenance_files) \
-  maintain/lib
+  maintain/lib \
+  Texinfo/command_data.txt
 
 # template.pod is the basis for the .pm documentation, and the script
 # invoked here updates them; to be run when template.pod changes.
@@ -323,9 +324,9 @@ Texinfo/ModulePath.pm: Texinfo/ModulePath.pm.in Makefile
            -e 's|[@]USE_EXTERNAL_UNIDECODE[@]|$(USE_EXTERNAL_UNIDECODE)|' \
          $(srcdir)/Texinfo/ModulePath.pm.in >$@
 
-Texinfo/Commands.pm: Texinfo/XS/parsetexi/command_data.txt
+Texinfo/Commands.pm: Texinfo/command_data.txt
        $(MKDIR_P) Texinfo
-       $(srcdir)/maintain/regenerate_commands_perl_info.pl < 
$(srcdir)/Texinfo/XS/parsetexi/command_data.txt
+       $(srcdir)/maintain/regenerate_commands_perl_info.pl < 
$(srcdir)/Texinfo/command_data.txt
 
 libsrcdir = $(srcdir)/maintain/lib
 
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index 624983939c..716437a3aa 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -158,13 +158,13 @@ BUILT_SOURCES=parsetexi/element_types.c \
 
 # Need to be distributed
 EXTRA_DIST+=$(p)/element_types.txt $(p)/element_types.awk \
-          $(p)/command_data.txt $(p)/command_data.awk
+          $(p)/command_data.awk
 
 $(srcdir)/$(p)/element_types.c $(srcdir)/$(p)/element_types.h: 
$(p)/element_types.txt $(p)/element_types.awk
        $(GAWK) -v srcdir=$(srcdir)/$(p) -f $(srcdir)/$(p)/element_types.awk \
             $(srcdir)/$(p)/element_types.txt
 
-$(srcdir)/$(p)/command_data.c $(srcdir)/$(p)/command_ids.h: 
$(p)/command_data.txt $(p)/command_data.awk
+$(srcdir)/$(p)/command_data.c $(srcdir)/$(p)/command_ids.h: 
../command_data.txt $(p)/command_data.awk
        $(GAWK) -v srcdir=$(srcdir)/$(p) -f $(srcdir)/$(p)/command_data.awk \
-            $(srcdir)/$(p)/command_data.txt
+            $(srcdir)/../command_data.txt
 
diff --git a/tp/Texinfo/XS/parsetexi/command_data.txt 
b/tp/Texinfo/command_data.txt
similarity index 100%
rename from tp/Texinfo/XS/parsetexi/command_data.txt
rename to tp/Texinfo/command_data.txt