texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: Install texi2any codes and included js in datadir


From: Patrice Dumas
Subject: branch master updated: Install texi2any codes and included js in datadir/texi2any
Date: Sun, 13 Oct 2024 04:10:31 -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 77d01cbc8b Install texi2any codes and included js in datadir/texi2any
77d01cbc8b is described below

commit 77d01cbc8b5721d06e631a653bc53e253159de10
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Oct 13 10:10:07 2024 +0200

    Install texi2any codes and included js in datadir/texi2any
    
    * configure.ac (CONVERTER), tp/Texinfo/XS/configure.ac (CONVERTER):
    add CONVERTER, set to texi2any.
    
    * Pod-Simple-Texinfo/Makefile.am (pod2texi),
    Pod-Simple-Texinfo/pod2texi.pl (BEGIN), tp/Makefile.am (do_subst),
    tp/texi2any.pl (BEGIN), util/Makefile.am (txixml2texi),
    util/txixml2texi.pl (BEGIN): pass libdir separately to set xsdir.
    Rename $lib_dir as $modules_dir.
    
    * Pod-Simple-Texinfo/Makefile.am (converterdatadir, modulesdir)
    (pod2texi), Pod-Simple-Texinfo/pod2texi.pl (BEGIN), js/Makefile.am
    (converterdatadir, jsdir), tp/Makefile.am (converterdatadir, do_subst)
    (modulesdir, convertmodulesdir, extensionsdir, initdir)
    (install-data-local, uninstall-local), tp/Texinfo/Convert/HTML.pm
    (_do_js_files), tp/Texinfo/ModulePath.pm.in ($converterdatadir),
    tp/Texinfo/XS/Makefile.am (converterlibdir, xsdir, converterdatadir)
    (modulesdir), tp/Texinfo/XS/convert/ConvertXS.xs (init),
    tp/Texinfo/XS/convert/convert_html.c (html_do_js_files),
    tp/Texinfo/XS/convert/converter.c (setup_converter_paths_information)
    (converter_setup), tp/Texinfo/XS/convert/converter.h
    (INSTALLED_PATHS), tp/Texinfo/XS/convert/texinfo.c (txi_setup),
    tp/Texinfo/XSLoader.pm (init), tp/texi2any.pl (BEGIN, $converter)
    ($extensions_dir, @converter_config_dirs, @converter_init_dirs),
    util/Makefile.am (txixml2texi), util/txixml2texi.pl (BEGIN): pass
    CONVERTER, install in $(datadir)/$(CONVERTER), rename/replace
    pkgdatadir by converterdatadir.
---
 ChangeLog                            | 31 +++++++++++++++
 Pod-Simple-Texinfo/Makefile.am       |  7 ++--
 Pod-Simple-Texinfo/pod2texi.pl       | 33 ++++++++--------
 configure.ac                         |  3 ++
 js/Makefile.am                       |  3 +-
 man/pod2texi.1                       |  2 +-
 tp/Makefile.am                       | 36 +++++++++---------
 tp/Texinfo/Convert/HTML.pm           |  2 +-
 tp/Texinfo/ModulePath.pm.in          |  7 ++--
 tp/Texinfo/XS/Makefile.am            |  7 +++-
 tp/Texinfo/XS/configure.ac           |  3 ++
 tp/Texinfo/XS/convert/ConvertXS.xs   |  8 ++--
 tp/Texinfo/XS/convert/convert_html.c |  2 +-
 tp/Texinfo/XS/convert/converter.c    | 12 +++---
 tp/Texinfo/XS/convert/converter.h    |  4 +-
 tp/Texinfo/XS/convert/texinfo.c      |  5 ++-
 tp/Texinfo/XS/convert/texinfo.h      |  2 +-
 tp/Texinfo/XS/main/build_perl_info.c |  2 +-
 tp/Texinfo/XS/main/build_perl_info.h |  2 +-
 tp/Texinfo/XS/parsetexi/Parsetexi.xs |  2 +-
 tp/Texinfo/XSLoader.pm               |  2 +-
 tp/texi2any.pl                       | 74 ++++++++++++++++++++----------------
 util/Makefile.am                     |  3 +-
 util/txixml2texi.pl                  | 27 ++++++-------
 24 files changed, 166 insertions(+), 113 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index da335cc326..d61bd89755 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2024-10-13  Patrice Dumas  <pertusus@free.fr>
+
+       Install texi2any codes and included js in datadir/texi2any
+
+       * configure.ac (CONVERTER), tp/Texinfo/XS/configure.ac (CONVERTER):
+       add CONVERTER, set to texi2any.
+
+       * Pod-Simple-Texinfo/Makefile.am (pod2texi),
+       Pod-Simple-Texinfo/pod2texi.pl (BEGIN), tp/Makefile.am (do_subst),
+       tp/texi2any.pl (BEGIN), util/Makefile.am (txixml2texi),
+       util/txixml2texi.pl (BEGIN): pass libdir separately to set xsdir.
+       Rename $lib_dir as $modules_dir.
+
+       * Pod-Simple-Texinfo/Makefile.am (converterdatadir, modulesdir)
+       (pod2texi), Pod-Simple-Texinfo/pod2texi.pl (BEGIN), js/Makefile.am
+       (converterdatadir, jsdir), tp/Makefile.am (converterdatadir, do_subst)
+       (modulesdir, convertmodulesdir, extensionsdir, initdir)
+       (install-data-local, uninstall-local), tp/Texinfo/Convert/HTML.pm
+       (_do_js_files), tp/Texinfo/ModulePath.pm.in ($converterdatadir),
+       tp/Texinfo/XS/Makefile.am (converterlibdir, xsdir, converterdatadir)
+       (modulesdir), tp/Texinfo/XS/convert/ConvertXS.xs (init),
+       tp/Texinfo/XS/convert/convert_html.c (html_do_js_files),
+       tp/Texinfo/XS/convert/converter.c (setup_converter_paths_information)
+       (converter_setup), tp/Texinfo/XS/convert/converter.h
+       (INSTALLED_PATHS), tp/Texinfo/XS/convert/texinfo.c (txi_setup),
+       tp/Texinfo/XSLoader.pm (init), tp/texi2any.pl (BEGIN, $converter)
+       ($extensions_dir, @converter_config_dirs, @converter_init_dirs),
+       util/Makefile.am (txixml2texi), util/txixml2texi.pl (BEGIN): pass
+       CONVERTER, install in $(datadir)/$(CONVERTER), rename/replace
+       pkgdatadir by converterdatadir.
+
 2024-10-12  Patrice Dumas  <pertusus@free.fr>
 
        * info/nodes.c (info_create_tag): do not set nodestart_adjusted to -1,
diff --git a/Pod-Simple-Texinfo/Makefile.am b/Pod-Simple-Texinfo/Makefile.am
index 4c5d1659f7..5829cfbcc6 100644
--- a/Pod-Simple-Texinfo/Makefile.am
+++ b/Pod-Simple-Texinfo/Makefile.am
@@ -26,15 +26,16 @@ EXTRA_DIST = Changes \
  tests \
  $(test_files)
 
-modulesdir = $(pkgdatadir)/Pod-Simple-Texinfo/Pod/Simple/
+converterdatadir = $(datadir)/$(CONVERTER)
+modulesdir = $(converterdatadir)/Pod-Simple-Texinfo/Pod/Simple/
 
 dist_modules_DATA = \
  lib/Pod/Simple/Texinfo.pm
 
 pod2texi: pod2texi.pl Makefile
        sed -e 's,[@]datadir[@],$(datadir),g' \
-       -e 's,[@]pkglibdir[@],$(pkglibdir),g' \
-       -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
+       -e 's,[@]libdir[@],$(libdir),g' \
+       -e 's,[@]CONVERTER[@],$(CONVERTER),g' \
        -e '1 s,/usr/bin/env perl,$(PERL),g' \
           $(srcdir)/pod2texi.pl >$@
        chmod a+x $@
diff --git a/Pod-Simple-Texinfo/pod2texi.pl b/Pod-Simple-Texinfo/pod2texi.pl
index da392d3196..0349651743 100755
--- a/Pod-Simple-Texinfo/pod2texi.pl
+++ b/Pod-Simple-Texinfo/pod2texi.pl
@@ -41,11 +41,9 @@ BEGIN
   my $updir = File::Spec->updir();
 
   my $datadir = '@datadir@';
-  my $package = '@PACKAGE@';
-  my $xsdir = '@pkglibdir@';
-
-  my $texinfolibdir;
-  my $lib_dir;
+  my $converter = '@CONVERTER@';
+  my $libdir = '@libdir@';
+  my $xsdir;
 
   my $in_source = 0;
   # set if we detect that the command comes from a Perl build with Makefile.PL.
@@ -84,30 +82,31 @@ BEGIN
     }
   } elsif (!$keep_paths) {
     # Look for modules in their installed locations.
-    my $lib_dir = File::Spec->catdir($datadir, $package);
+    my $modules_dir = File::Spec->catdir($datadir, $converter);
     # look for package data in the installed location.
-    my $modules_pkgdatadir = $lib_dir;
+    my $modules_converterdatadir = $modules_dir;
 
     # try to make package relocatable, will only work if
     # standard relative paths are used
-    if (! -f File::Spec->catfile($lib_dir, 'Texinfo', 'Parser.pm')
+    if (! -f File::Spec->catfile($modules_dir, 'Texinfo', 'Parser.pm')
         and -f File::Spec->catfile($command_directory, $updir, 'share',
-                                   $package, 'Texinfo', 'Parser.pm')) {
-      $lib_dir = File::Spec->catdir($command_directory, $updir,
-                                          'share', $package);
-      $modules_pkgdatadir = File::Spec->catdir($command_directory, $updir,
-                                          'share', $package);
+                                   $converter, 'Texinfo', 'Parser.pm')) {
+      $modules_dir = File::Spec->catdir($command_directory, $updir,
+                                          'share', $converter);
+      $modules_converterdatadir = File::Spec->catdir($command_directory, 
$updir,
+                                          'share', $converter);
       $xsdir = File::Spec->catdir($command_directory, $updir,
-                                          'lib', $package);
+                                          'lib', $converter);
     }
 
-    unshift @INC, $lib_dir;
+    unshift @INC, $modules_dir;
     require Texinfo::ModulePath;
-    Texinfo::ModulePath::init($lib_dir, $xsdir, $modules_pkgdatadir,
+    Texinfo::ModulePath::init($modules_dir, $xsdir, $modules_converterdatadir,
                               'installed' => 1);
 
     # To find Pod::Simple::Texinfo
-    unshift @INC, File::Spec->catdir($modules_pkgdatadir, 
'Pod-Simple-Texinfo');
+    unshift @INC, File::Spec->catdir($modules_converterdatadir,
+                                     'Pod-Simple-Texinfo');
   }
 }
 
diff --git a/configure.ac b/configure.ac
index 9b3878c5f5..ff90e4b1dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,9 @@ AC_CONFIG_SRCDIR([info/info.c])
 TEXINFO_DTD_VERSION=7.2
 AC_SUBST([TEXINFO_DTD_VERSION])
 
+CONVERTER=texi2any
+AC_SUBST([CONVERTER])
+
 # Package date.
 PACKAGE_DATE=`${SHELL} "$srcdir"/build-aux/mdate-sh "$srcdir"/configure.ac`
 AC_SUBST([PACKAGE_DATE])
diff --git a/js/Makefile.am b/js/Makefile.am
index 56e8b84316..95801a4e45 100644
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -47,7 +47,8 @@ endif
 EXTRA_DIST =
 
 
-jsdir=$(pkgdatadir)/js
+converterdatadir = $(datadir)/$(CONVERTER)
+jsdir=$(converterdatadir)/js
 
 # Javascript files that will be included in the html pages.  The order
 # of those files is the order in which they will be included
diff --git a/man/pod2texi.1 b/man/pod2texi.1
index 229aa5bed1..1d6e251eed 100644
--- a/man/pod2texi.1
+++ b/man/pod2texi.1
@@ -55,7 +55,7 @@
 .\" ========================================================================
 .\"
 .IX Title "POD2TEXI 1"
-.TH POD2TEXI 1 2024-09-20 perl "User Contributed Perl Documentation"
+.TH POD2TEXI 1 2024-10-12 perl "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/tp/Makefile.am b/tp/Makefile.am
index 6505cda556..3667fd0639 100644
--- a/tp/Makefile.am
+++ b/tp/Makefile.am
@@ -36,6 +36,7 @@ SUBDIRS += . tests
 
 DIST_SUBDIRS = Texinfo/XS tests
 
+converterdatadir = $(datadir)/$(CONVERTER)
 
 bin_SCRIPTS = texi2any
 
@@ -47,8 +48,9 @@ do_subst = sed \
   -e 's,[@]prefix[@],$(prefix),g' \
   -e 's,[@]datarootdir[@],$(datarootdir),g' \
   -e 's,[@]datadir[@],$(datadir),g' \
-  -e 's,[@]pkglibdir[@],$(pkglibdir),g' \
+  -e 's,[@]libdir[@],$(libdir),g' \
   -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
+  -e 's,[@]CONVERTER[@],$(CONVERTER),g' \
   -e 's,[@]USE_EXTERNAL_LIBINTL[@],$(USE_EXTERNAL_LIBINTL),g' \
   -e 's,[@]USE_EXTERNAL_EASTASIANWIDTH[@],$(USE_EXTERNAL_EASTASIANWIDTH),g' \
   -e 's,[@]USE_EXTERNAL_UNIDECODE[@],$(USE_EXTERNAL_UNIDECODE),g' \
@@ -64,7 +66,7 @@ makeinfo: texi2any
        rm -f $@
        -$(LN_S) texi2any $@
 
-modulesdir = $(pkgdatadir)/Texinfo
+modulesdir = $(converterdatadir)/Texinfo
 dist_modules_DATA = \
  Texinfo/Config.pm \
  Texinfo/Common.pm \
@@ -101,8 +103,8 @@ dist_noinst_DATA = \
 modules_DATA = \
  Texinfo/ModulePath.pm
 
-convertersdir = $(pkgdatadir)/Texinfo/Convert
-dist_converters_DATA = \
+convertmodulesdir = $(converterdatadir)/Texinfo/Convert
+dist_convertmodules_DATA = \
  Texinfo/Convert/Converter.pm \
  Texinfo/Convert/ConvertXS.pm \
  Texinfo/Convert/DocBook.pm \
@@ -126,14 +128,14 @@ dist_converters_DATA = \
  Texinfo/Convert/Utils.pm
 
 # extensions used in main program
-extensionsdir = $(datadir)/texinfo/ext
+extensionsdir = $(converterdatadir)/ext
 dist_extensions_DATA = \
  ext/epub3.pm \
  ext/highlight_syntax.pm \
  ext/tex4ht.pm \
  ext/latex2html.pm
 
-initdir = $(datadir)/texinfo/init
+initdir = $(converterdatadir)/init
 dist_init_DATA = \
  init/book.pm \
  init/chm.pm \
@@ -404,26 +406,26 @@ libsrcdir = $(srcdir)/maintain/lib
 
 install-data-local:
        if test $(USE_EXTERNAL_LIBINTL) != 'yes' ; then \
-         $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode 
\
-           $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData; \
+         $(MKDIR_P) 
$(DESTDIR)$(converterdatadir)/lib/libintl-perl/lib/Locale/Recode \
+           
$(DESTDIR)$(converterdatadir)/lib/libintl-perl/lib/Locale/RecodeData; \
          $(INSTALL_DATA) $(libsrcdir)/libintl-perl/lib/Locale/*.pm \
-           $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale; \
+           $(DESTDIR)$(converterdatadir)/lib/libintl-perl/lib/Locale; \
          $(INSTALL_DATA) $(libsrcdir)/libintl-perl/lib/Locale/Recode/*.pm \
-           $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode; \
+           $(DESTDIR)$(converterdatadir)/lib/libintl-perl/lib/Locale/Recode; \
          $(INSTALL_DATA) $(libsrcdir)/libintl-perl/lib/Locale/RecodeData/*.pm \
-           $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData; \
+           
$(DESTDIR)$(converterdatadir)/lib/libintl-perl/lib/Locale/RecodeData; \
        fi
        if test $(USE_EXTERNAL_EASTASIANWIDTH) != 'yes' ; then \
-         $(MKDIR_P) 
$(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode; \
+         $(MKDIR_P) 
$(DESTDIR)$(converterdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode; \
          $(INSTALL_DATA) 
$(libsrcdir)/Unicode-EastAsianWidth/lib/Unicode/EastAsianWidth.pm \
-          $(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode; \
+          
$(DESTDIR)$(converterdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode; \
        fi
        if test $(USE_EXTERNAL_UNIDECODE) != 'yes' ; then \
-         $(MKDIR_P) 
$(DESTDIR)$(pkgdatadir)/lib/Text-Unidecode/lib/Text/Unidecode; \
+         $(MKDIR_P) 
$(DESTDIR)$(converterdatadir)/lib/Text-Unidecode/lib/Text/Unidecode; \
          $(INSTALL_DATA) $(libsrcdir)/Text-Unidecode/lib/Text/Unidecode.pm \
-           $(DESTDIR)$(pkgdatadir)/lib/Text-Unidecode/lib/Text; \
+           $(DESTDIR)$(converterdatadir)/lib/Text-Unidecode/lib/Text; \
          $(INSTALL_DATA) $(libsrcdir)/Text-Unidecode/lib/Text/Unidecode/*.pm \
-           $(DESTDIR)$(pkgdatadir)/lib/Text-Unidecode/lib/Text/Unidecode; \
+           
$(DESTDIR)$(converterdatadir)/lib/Text-Unidecode/lib/Text/Unidecode; \
        fi
 
 install-exec-hook:
@@ -434,7 +436,7 @@ dist-hook:
        rm -rf `find $(distdir)/maintain/lib -name .git -o -name gettext_xs.o`
 
 uninstall-local:
-       rm -rf $(DESTDIR)$(pkgdatadir)/lib/
+       rm -rf $(DESTDIR)$(converterdatadir)/lib/
 
 distclean-local:
        rm -rf LocaleData
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 547df90efa..fa26027638 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -12459,7 +12459,7 @@ sub _do_js_files($$)
         my $jssrcdir;
         if (!$Texinfo::ModulePath::texinfo_uninstalled) {
           $jssrcdir = File::Spec->catdir(
-            $Texinfo::ModulePath::pkgdatadir, 'js');
+            $Texinfo::ModulePath::converterdatadir, 'js');
         } else {
           $jssrcdir = File::Spec->catdir(
             $Texinfo::ModulePath::top_srcdir, 'js');
diff --git a/tp/Texinfo/ModulePath.pm.in b/tp/Texinfo/ModulePath.pm.in
index 855020d388..afe5664c83 100644
--- a/tp/Texinfo/ModulePath.pm.in
+++ b/tp/Texinfo/ModulePath.pm.in
@@ -31,7 +31,7 @@ our $top_builddir;
 our $top_srcdir;
 
 # installed locations paths, if not $Texinfo::ModulePath::texinfo_uninstalled
-our $pkgdatadir;
+our $converterdatadir;
 
 # Other information passed to modules from configure
 our $conversion_from_euc_cn = '@ICONV_CONVERTS_EUC_CN@';
@@ -43,14 +43,14 @@ our $conversion_from_euc_cn = '@ICONV_CONVERTS_EUC_CN@';
 #
 # LIB_DIR is for bundled libraries.
 # LIBEXEC_DIR is for XS modules.
-# PKGDATADIR is for HTML extensions, javascript
+# CONVERTERDATADIR is for HTML extensions, javascript
 #
 # otherwise use 'top_srcdir'
 # and 'top_builddir' environment variables.
 sub init {
   my $lib_dir = shift;
   my $libexec_dir = shift;
-  $pkgdatadir = shift;
+  $converterdatadir = shift;
   my %named_args = @_;
 
   if (!$named_args{'installed'}) {
@@ -116,7 +116,6 @@ sub init {
       unshift @INC, (File::Spec->catdir($lib_dir, 'lib', 'Text-Unidecode', 
'lib'));
     }
   }
-
 }
 
 sub import {
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index 7478fa1ac2..101038877b 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -33,11 +33,13 @@ EXTRA_DIST+=gnulib/m4/gnulib-cache.m4
 
 ################### End Gnulib section #########################
 
+converterlibdir = $(libdir)/$(CONVERTER)
+
 AM_CPPFLAGS += -DDATADIR=\"$(datadir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
 
 ######################## Perl ################################
 
-xsdir = $(pkglibdir)
+xsdir = $(converterlibdir)
 
 .xs.c:
        $(XSUBPP) $(XSUBPPARGS) $< > $*.xsc && mv $*.xsc $*.c
@@ -439,7 +441,8 @@ libtexinfo_convert_la_LDFLAGS = -version-info 0:0:0 
$(perl_conf_LDFLAGS) $(EUIDA
 
 ########################## Parsetexi XS parser
 
-modulesdir = $(pkgdatadir)/Texinfo/XS/parsetexi
+converterdatadir = $(datadir)/$(CONVERTER)
+modulesdir = $(converterdatadir)/Texinfo/XS/parsetexi
 dist_modules_DATA = parsetexi/Parsetexi.pm
 
 if HAVE_ICONV
diff --git a/tp/Texinfo/XS/configure.ac b/tp/Texinfo/XS/configure.ac
index fca9623763..6623abfc06 100644
--- a/tp/Texinfo/XS/configure.ac
+++ b/tp/Texinfo/XS/configure.ac
@@ -15,6 +15,9 @@ AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([gnulib/m4])
 
+CONVERTER=texi2any
+AC_SUBST([CONVERTER])
+
 b='\'
 d='$'
 o='@<:@' dnl quadrigraph for [ - see autoconf documentation
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs 
b/tp/Texinfo/XS/convert/ConvertXS.xs
index a0ff730d23..ce6e1ff2dc 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -77,11 +77,11 @@ PROTOTYPES: ENABLE
 # Called from Texinfo::XSLoader.pm.
 # File paths are byte strings and can be in any encoding.
 int
-init (int texinfo_uninstalled, SV *pkgdatadir_sv, SV *tp_builddir_sv, SV 
*top_srcdir_sv)
+init (int texinfo_uninstalled, SV *converterdatadir_sv, SV *tp_builddir_sv, SV 
*top_srcdir_sv)
       PREINIT:
         const char *tp_builddir = 0;
         const char *top_srcdir = 0;
-        const char *pkgdatadir = 0;
+        const char *converterdatadir = 0;
       CODE:
         if (texinfo_uninstalled)
           {
@@ -91,9 +91,9 @@ init (int texinfo_uninstalled, SV *pkgdatadir_sv, SV 
*tp_builddir_sv, SV *top_sr
               top_srcdir = SvPVbyte_nolen (top_srcdir_sv);
           }
         else
-          pkgdatadir = SvPVbyte_nolen (pkgdatadir_sv);
+          converterdatadir = SvPVbyte_nolen (converterdatadir_sv);
 
-        converter_setup (texinfo_uninstalled, pkgdatadir, tp_builddir,
+        converter_setup (texinfo_uninstalled, converterdatadir, tp_builddir,
                          top_srcdir);
         RETVAL = 1;
     OUTPUT:
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index 82f85b61d0..4b18346c56 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -2419,7 +2419,7 @@ html_do_js_files (CONVERTER *self)
               if (!conversion_paths_info.texinfo_uninstalled)
                 {
                   xasprintf (&jssrcdir, "%s/%s",
-                             conversion_paths_info.p.installed.pkgdatadir,
+                        conversion_paths_info.p.installed.converterdatadir,
                              "js");
                 }
               else
diff --git a/tp/Texinfo/XS/convert/converter.c 
b/tp/Texinfo/XS/convert/converter.c
index 9a547bc256..e5d38c25ea 100644
--- a/tp/Texinfo/XS/convert/converter.c
+++ b/tp/Texinfo/XS/convert/converter.c
@@ -119,7 +119,7 @@ const char 
*xml_text_entity_no_arg_commands_formatting[BUILTIN_CMD_NUMBER];
 static void
 setup_converter_paths_information (int texinfo_uninstalled,
                                    const char *tp_builddir,
-                             const char *pkgdatadir, const char *top_srcdir)
+                         const char *converterdatadir, const char *top_srcdir)
 {
   memset (&conversion_paths_info, 0, sizeof (PATHS_INFORMATION));
   conversion_paths_info.texinfo_uninstalled = texinfo_uninstalled;
@@ -134,21 +134,21 @@ setup_converter_paths_information (int 
texinfo_uninstalled,
     }
   else
     {
-      if (pkgdatadir)
-        conversion_paths_info.p.installed.pkgdatadir
-          = strdup (pkgdatadir);
+      if (converterdatadir)
+        conversion_paths_info.p.installed.converterdatadir
+          = strdup (converterdatadir);
     }
 }
 
 /* called only once */
 void
 converter_setup (int texinfo_uninstalled, const char *tp_builddir,
-                 const char *pkgdatadir, const char *top_srcdir)
+                 const char *converterdatadir, const char *top_srcdir)
 {
   int i;
 
   setup_converter_paths_information (texinfo_uninstalled,
-                             pkgdatadir, tp_builddir, top_srcdir);
+                             converterdatadir, tp_builddir, top_srcdir);
 
   txi_setup_lib_data ();
 
diff --git a/tp/Texinfo/XS/convert/converter.h 
b/tp/Texinfo/XS/convert/converter.h
index e7c4cf713a..199a586397 100644
--- a/tp/Texinfo/XS/convert/converter.h
+++ b/tp/Texinfo/XS/convert/converter.h
@@ -74,7 +74,7 @@ typedef struct FLOAT_CAPTION_PREPENDED_ELEMENT {
 } FLOAT_CAPTION_PREPENDED_ELEMENT;
 
 typedef struct INSTALLED_PATHS {
-    const char *pkgdatadir;
+    const char *converterdatadir;
 } INSTALLED_PATHS;
 
 typedef struct UNINSTALLED_PATHS {
@@ -121,7 +121,7 @@ extern PATHS_INFORMATION conversion_paths_info;
 extern CONVERTER_FORMAT_DATA converter_format_data[];
 
 void converter_setup (int texinfo_uninstalled, const char *tp_builddir,
-                      const char *pkgdatadir, const char *top_srcdir);
+                      const char *converterdatadir, const char *top_srcdir);
 
 enum converter_format find_format_name_converter_format (const char *format);
 enum converter_format find_perl_converter_class_converter_format (
diff --git a/tp/Texinfo/XS/convert/texinfo.c b/tp/Texinfo/XS/convert/texinfo.c
index bc9291675f..cfac5145fd 100644
--- a/tp/Texinfo/XS/convert/texinfo.c
+++ b/tp/Texinfo/XS/convert/texinfo.c
@@ -48,12 +48,13 @@
 void
 txi_setup (const char *localesdir, int texinfo_uninstalled,
                  const char *tp_builddir,
-                 const char *pkgdatadir, const char *top_srcdir)
+                 const char *converterdatadir, const char *top_srcdir)
 {
   if (localesdir)
     configure_output_strings_translations (localesdir, 0);
 
-  converter_setup (texinfo_uninstalled, tp_builddir, pkgdatadir, top_srcdir);
+  converter_setup (texinfo_uninstalled, tp_builddir,
+                   converterdatadir, top_srcdir);
   html_format_setup ();
 }
 
diff --git a/tp/Texinfo/XS/convert/texinfo.h b/tp/Texinfo/XS/convert/texinfo.h
index 48ddb7362d..db443da9ae 100644
--- a/tp/Texinfo/XS/convert/texinfo.h
+++ b/tp/Texinfo/XS/convert/texinfo.h
@@ -28,7 +28,7 @@ size_t parse_file (const char *input_file_path, int *status);
 /* locales dir for output strings translations */
 void txi_setup (const char *localesdir, int texinfo_uninstalled,
                 const char *tp_builddir,
-                const char *pkgdatadir, const char *top_srcdir);
+                const char *converterdatadir, const char *top_srcdir);
 
 void txi_parser (const char *file_path, const char *locale_encoding,
                 const char **expanded_formats, const VALUE_LIST *values,
diff --git a/tp/Texinfo/XS/main/build_perl_info.c 
b/tp/Texinfo/XS/main/build_perl_info.c
index 8364dedca7..0914b4eb4c 100644
--- a/tp/Texinfo/XS/main/build_perl_info.c
+++ b/tp/Texinfo/XS/main/build_perl_info.c
@@ -157,7 +157,7 @@ perl_only_strndup (const char *s, size_t n)
 
 /* called once at loading time */
 int
-init (int texinfo_uninstalled, SV *pkgdatadir_sv, SV *builddir_sv,
+init (int texinfo_uninstalled, SV *converterdatadir_sv, SV *builddir_sv,
       SV *top_srcdir_sv)
 {
 #ifdef ENABLE_NLS
diff --git a/tp/Texinfo/XS/main/build_perl_info.h 
b/tp/Texinfo/XS/main/build_perl_info.h
index b2cc9623a5..2b36f99fca 100644
--- a/tp/Texinfo/XS/main/build_perl_info.h
+++ b/tp/Texinfo/XS/main/build_perl_info.h
@@ -21,7 +21,7 @@ void *perl_only_malloc (size_t size);
 char *perl_only_strdup (const char *s);
 char *perl_only_strndup (const char *s, size_t n);
 
-int init (int texinfo_uninstalled, SV *pkgdatadir_sv, SV *builddir_sv,
+int init (int texinfo_uninstalled, SV *converterdatadir_sv, SV *builddir_sv,
           SV *top_srcdir_sv);
 
 /* in call_perl_function.c, but declared here to avoid pulling in Perl
diff --git a/tp/Texinfo/XS/parsetexi/Parsetexi.xs 
b/tp/Texinfo/XS/parsetexi/Parsetexi.xs
index 37d91a230c..dd6338a0c0 100644
--- a/tp/Texinfo/XS/parsetexi/Parsetexi.xs
+++ b/tp/Texinfo/XS/parsetexi/Parsetexi.xs
@@ -57,7 +57,7 @@ PROTOTYPES: ENABLE
 # Called from Texinfo::XSLoader.pm.  The arguments are not actually used.
 # File paths are byte strings and can be in any encoding.
 int
-init (int texinfo_uninstalled, SV *pkgdatadir, SV *tp_builddir, SV *top_srcdir)
+init (int texinfo_uninstalled, SV *converterdatadir, SV *tp_builddir, SV 
*top_srcdir)
 
 void
 reset_parser (int debug_output)
diff --git a/tp/Texinfo/XSLoader.pm b/tp/Texinfo/XSLoader.pm
index 0faaeabb97..7206dc0851 100644
--- a/tp/Texinfo/XSLoader.pm
+++ b/tp/Texinfo/XSLoader.pm
@@ -227,7 +227,7 @@ sub init {
 
   if (defined &{"${module}::init"}
       and !&{"${module}::init"} ($Texinfo::ModulePath::texinfo_uninstalled,
-                                 $Texinfo::ModulePath::pkgdatadir,
+                                 $Texinfo::ModulePath::converterdatadir,
                                  $Texinfo::ModulePath::tp_builddir,
                                  $Texinfo::ModulePath::top_srcdir)) {
     _fatal "$module_name: error initializing";
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index abb76befe9..c0889b6453 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -68,8 +68,9 @@ BEGIN
 
   # These are substituted by the Makefile to create "texi2any".
   my $datadir = '@datadir@';
-  my $package = '@PACKAGE@';
-  my $xsdir = '@pkglibdir@';
+  my $converter = '@CONVERTER@';
+  my $libdir = '@libdir@';
+  my $xsdir;
 
   if ($datadir eq '@' .'datadir@'
       or defined($ENV{'TEXINFO_DEV_SOURCE'})
@@ -88,29 +89,32 @@ BEGIN
     Texinfo::ModulePath::init(undef, undef, undef, 'updirs' => 1);
   } else {
     # Look for modules in their installed locations.
-    my $lib_dir = File::Spec->catdir($datadir, $package);
+    my $modules_dir = File::Spec->catdir($datadir, $converter);
     # look for package data in the installed location.
-    # actually the same as $pkgdatadir in main program below, but use
+    # actually the same as $converterdatadir in main program below, but use
     # another name to avoid confusion.
-    my $modules_pkgdatadir = $lib_dir;
+    my $modules_converterdatadir = $modules_dir;
+    $xsdir = File::Spec->catdir($libdir, $converter);
 
     # try to make package relocatable, will only work if
     # standard relative paths are used
-    if (! -f File::Spec->catfile($lib_dir, 'Texinfo', 'Parser.pm')
+    if (! -f File::Spec->catfile($modules_dir, 'Texinfo', 'Parser.pm')
         and -f File::Spec->catfile($command_directory, $updir, 'share',
-                                   $package, 'Texinfo', 'Parser.pm')) {
-      $lib_dir = File::Spec->catdir($command_directory, $updir,
-                                          'share', $package);
-      $modules_pkgdatadir = File::Spec->catdir($command_directory, $updir,
-                                               'share', $package);
+                                   $converter, 'Texinfo', 'Parser.pm')) {
+      $modules_dir = File::Spec->catdir($command_directory, $updir,
+                                          'share', $converter);
+      $modules_converterdatadir
+                  = File::Spec->catdir($command_directory, $updir,
+                                               'share', $converter);
       $xsdir = File::Spec->catdir($command_directory, $updir,
-                                          'lib', $package);
+                                          'lib', $converter);
     }
 
-    unshift @INC, $lib_dir;
+    unshift @INC, $modules_dir;
 
     require Texinfo::ModulePath;
-    Texinfo::ModulePath::init($lib_dir, $xsdir, $modules_pkgdatadir,
+    Texinfo::ModulePath::init($modules_dir, $xsdir,
+                              $modules_converterdatadir,
                               'installed' => 1);
   }
 } # end BEGIN
@@ -146,10 +150,11 @@ my $updir = File::Spec->updir();
 # set by configure, prefix for the sysconfdir and so on
 # This could be used in the eval
 my $prefix = '@prefix@';
+my $datadir;
 my $datarootdir;
 my $sysconfdir;
 my $pkgdatadir;
-my $datadir;
+my $converter;
 
 my $fallback_prefix = File::Spec->catdir(File::Spec->rootdir(), 'usr', 
'local');
 
@@ -171,10 +176,12 @@ if ('@datarootdir@' ne '@' . 'datarootdir@') {
 if ('@datadir@' ne '@' . 'datadir@' and '@PACKAGE@' ne '@' . 'PACKAGE@') {
   $datadir = eval '"@datadir@"';
   my $package = '@PACKAGE@';
+  $converter = '@CONVERTER@';
   $pkgdatadir = File::Spec->catdir($datadir, $package);
 } else {
   $datadir = File::Spec->catdir($fallback_prefix, 'share');
   $pkgdatadir = File::Spec->catdir($datadir, 'texinfo');
+  $converter = 'texi2any';
 }
 
 my $extensions_dir;
@@ -182,7 +189,8 @@ if ($Texinfo::ModulePath::texinfo_uninstalled) {
   $extensions_dir = File::Spec->catdir($Texinfo::ModulePath::top_srcdir,
                                        'tp', 'ext');
 } else {
-  $extensions_dir = File::Spec->catdir($Texinfo::ModulePath::pkgdatadir, 
'ext');
+  $extensions_dir
+    = File::Spec->catdir($Texinfo::ModulePath::converterdatadir, 'ext');
 }
 
 my $internal_extension_dirs = [$extensions_dir];
@@ -508,27 +516,27 @@ my @texinfo_language_config_dirs = @$language_config_dirs;
 #                               if (defined($datadir));
 
 # these variables are used as part of binary strings.
-my @program_config_dirs;
-my @program_init_dirs;
+my @converter_config_dirs;
+my @converter_init_dirs;
 
-my $program_name = 'texi2any';
-my $program_config_dirs_array_ref
-  = set_subdir_directories($program_name, \%deprecated_directories);
+my $converter_config_dirs_array_ref
+  = set_subdir_directories($converter, \%deprecated_directories);
 
-@program_config_dirs = ($curdir, @$program_config_dirs_array_ref);
+@converter_config_dirs = ($curdir, @$converter_config_dirs_array_ref);
 
-#@program_config_dirs = ($curdir, File::Spec->catdir($curdir, 
".$program_name"));
-#push @program_config_dirs, File::Spec->catdir($ENV{'HOME'}, ".$program_name")
+#@converter_config_dirs
+#   = ($curdir, File::Spec->catdir($curdir, ".$converter"));
+#push @converter_config_dirs, File::Spec->catdir($ENV{'HOME'}, ".$converter")
 #       if (defined($ENV{'HOME'}));
-#push @program_config_dirs, File::Spec->catdir($sysconfdir, $program_name)
+#push @converter_config_dirs, File::Spec->catdir($sysconfdir, $converter)
 #       if (defined($sysconfdir));
-#push @program_config_dirs, File::Spec->catdir($datadir, $program_name)
+#push @converter_config_dirs, File::Spec->catdir($datadir, $converter)
 #  if (defined($datadir));
 
-@program_init_dirs = @program_config_dirs;
+@converter_init_dirs = @converter_config_dirs;
 foreach my $texinfo_config_dir (@texinfo_language_config_dirs) {
   my $init_dir = File::Spec->catdir($texinfo_config_dir, 'init');
-  push @program_init_dirs, $init_dir;
+  push @converter_init_dirs, $init_dir;
   if ($deprecated_directories{$texinfo_config_dir}) {
     $deprecated_directories{$init_dir}
    = File::Spec->catdir($deprecated_directories{$texinfo_config_dir}, 'init');
@@ -537,9 +545,9 @@ foreach my $texinfo_config_dir 
(@texinfo_language_config_dirs) {
 
 # add texi2any extensions dir too, such as the init files there
 # can also be loaded as regular init files.
-push @program_init_dirs, $extensions_dir;
+push @converter_init_dirs, $extensions_dir;
 
-#print STDERR join("\n", @program_init_dirs)."\n\n";
+#print STDERR join("\n", @converter_init_dirs)."\n\n";
 #print STDERR join("\n", sort(keys(%deprecated_directories)))."\n";
 
 
@@ -733,7 +741,7 @@ set_translations_encoding($translations_encoding);
 # files replace default options.
 my ($config_init_files, $deprecated_dirs_for_config_init)
  = Texinfo::Common::locate_file_in_dirs($conf_file_name,
-                             [ reverse(@program_config_dirs) ], 1,
+                             [ reverse(@converter_config_dirs) ], 1,
                                         \%deprecated_directories);
 if (defined($config_init_files)) {
   foreach my $file (@$config_init_files) {
@@ -1131,7 +1139,7 @@ my $result_options = Getopt::Long::GetOptions (
  'help|h' => sub { print _encode_message(makeinfo_help()); exit 0; },
  'version|V' => sub {
     print _encode_message(
-                    "$program_name (GNU texinfo) $configured_version\n\n");
+                    "$converter (GNU texinfo) $configured_version\n\n");
     print _encode_message(sprintf __(
 "Copyright (C) %s Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
@@ -1234,7 +1242,7 @@ There is NO WARRANTY, to the extent permitted by 
law.\n"), "2024");
     if (get_conf('TEST')) {
       locate_and_load_init_file($_[1], [ @conf_dirs ]);
     } else {
-      locate_and_load_init_file($_[1], [ @conf_dirs, @program_init_dirs ],
+      locate_and_load_init_file($_[1], [ @conf_dirs, @converter_init_dirs ],
                                 \%deprecated_directories);
     }
  },
diff --git a/util/Makefile.am b/util/Makefile.am
index cb356f92e9..1fee5598d4 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -25,7 +25,8 @@ pdftexi2dvi: texi2pdf
 
 txixml2texi: txixml2texi.pl Makefile
        sed -e 's,[@]datadir[@],$(datadir),g' \
-       -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
+       -e 's,[@]libdir[@],$(libdir),g' \
+       -e 's,[@]CONVERTER[@],$(CONVERTER),g' \
        -e 's,[@]USE_EXTERNAL_LIBINTL[@],$(USE_EXTERNAL_LIBINTL),g' \
        -e 
's,[@]USE_EXTERNAL_EASTASIANWIDTH[@],$(USE_EXTERNAL_EASTASIANWIDTH),g' \
        -e 's,[@]USE_EXTERNAL_UNIDECODE[@],$(USE_EXTERNAL_UNIDECODE),g' \
diff --git a/util/txixml2texi.pl b/util/txixml2texi.pl
index e86916c709..826c8730f0 100755
--- a/util/txixml2texi.pl
+++ b/util/txixml2texi.pl
@@ -38,8 +38,9 @@ BEGIN
   my $updir = File::Spec->updir();
 
   my $datadir = '@datadir@';
-  my $package = '@PACKAGE@';
-  my $xsdir = '@pkglibdir@';
+  my $converter = '@CONVERTER@';
+  my $libdir = '@libdir@';
+  my $xsdir;
 
   # in-source run
   if ($datadir eq '@' .'datadir@'
@@ -58,26 +59,26 @@ BEGIN
     Texinfo::ModulePath::init(undef, undef, undef, 'updirs' => 1);
   } else {
     # Look for modules in their installed locations.
-    my $lib_dir = File::Spec->catdir($datadir, $package);
+    my $modules_dir = File::Spec->catdir($datadir, $converter);
     # look for package data in the installed location.
-    my $modules_pkgdatadir = $lib_dir;
+    my $modules_converterdatadir = $modules_dir;
 
     # try to make package relocatable, will only work if
     # standard relative paths are used
-    if (! -f File::Spec->catfile($lib_dir, 'Texinfo', 'Parser.pm')
+    if (! -f File::Spec->catfile($modules_dir, 'Texinfo', 'Parser.pm')
         and -f File::Spec->catfile($command_directory, $updir, 'share',
-                                   $package, 'Texinfo', 'Parser.pm')) {
-      $lib_dir = File::Spec->catdir($command_directory, $updir,
-                                          'share', $package);
-      $modules_pkgdatadir = File::Spec->catdir($command_directory, $updir,
-                                          'share', $package);
+                                   $converter, 'Texinfo', 'Parser.pm')) {
+      $modules_dir = File::Spec->catdir($command_directory, $updir,
+                                          'share', $converter);
+      $modules_converterdatadir = File::Spec->catdir($command_directory, 
$updir,
+                                          'share', $converter);
       $xsdir = File::Spec->catdir($command_directory, $updir,
-                                          'lib', $package);
+                                          'lib', $converter);
     }
-    unshift @INC, $lib_dir;
+    unshift @INC, $modules_dir;
 
     require Texinfo::ModulePath;
-    Texinfo::ModulePath::init($lib_dir, $xsdir, $modules_pkgdatadir,
+    Texinfo::ModulePath::init($modules_dir, $xsdir, $modules_converterdatadir,
                               'installed' => 1);
   }
 }



reply via email to

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