[8066] texi2any.pl

[gavinsmith0123]

Revision: 8066
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8066
Author:   gavin
Date:     2018-08-15 06:23:46 -0400 (Wed, 15 Aug 2018)
Log Message:
-----------
texi2any.pl

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/texi2any.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-08-14 20:16:46 UTC (rev 8065)
+++ trunk/ChangeLog     2018-08-15 10:23:46 UTC (rev 8066)
@@ -1,5 +1,16 @@
+2018-08-15  Gavin Smith  <address@hidden>
+
+       * tp/texi2any.pl: Only call fileparse once (used for both 
+       finding modules and translation files).  Do not add a directory 
+       to @INC that Texinfo::ModulePath takes care of adding.  Add a 
+       comment.
+
 2018-08-14  Gavin Smith  <address@hidden>
 
+       * autogen.sh: Initialise tp/Texinfo/XS directory.
+
+2018-08-14  Gavin Smith  <address@hidden>
+
        * configure.ac (xs_srcdir): Update path from XS builddir to 
        srcdir.
        * tp/Texinfo/XS/fail.pl: update path to TestXS module.

Modified: trunk/tp/texi2any.pl
===================================================================
--- trunk/tp/texi2any.pl        2018-08-14 20:16:46 UTC (rev 8065)
+++ trunk/tp/texi2any.pl        2018-08-15 10:23:46 UTC (rev 8066)
@@ -39,6 +39,8 @@
 
 Getopt::Long::Configure("gnu_getopt");
 
+my ($real_command_name, $command_directory, $command_suffix);
+
 # This big BEGIN block deals with finding modules and 
 # some dependencies that we ship 
 # * in source or
@@ -48,7 +50,7 @@
 {
   # emulate -w
   $^W = 1;
-  my ($real_command_name, $command_directory, $command_suffix) 
+  ($real_command_name, $command_directory, $command_suffix) 
      = fileparse($0, '.pl');
   my $updir = File::Spec->updir();
 
@@ -70,11 +72,6 @@
     }
     unshift @INC, File::Spec->catdir($ENV{'top_builddir'}, 'tp');
 
-    if (defined($ENV{'top_srcdir'})) {
-      my $lib_dir = File::Spec->catdir($ENV{'top_srcdir'}, 'tp');
-      unshift @INC, $lib_dir;
-    }
-
     require Texinfo::ModulePath;
     Texinfo::ModulePath::init();
   } else {
@@ -97,6 +94,7 @@
   }
 } # end BEGIN
 
+# This allows disabling use of XS modules when Texinfo is built.
 BEGIN {
   my $enable_xs = '@enable_xs@';
   if ($enable_xs eq 'no') {
@@ -110,9 +108,6 @@
 use Texinfo::Common;
 use Texinfo::Convert::Converter;
 
-my ($real_command_name, $command_directory, $command_suffix) 
-   = fileparse($0, '.pl');
-
 # this associates the command line options to the arrays set during
 # command line parsing.
 my @css_files = ();