texinfo-commits
[Top][All Lists]
Advanced

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

[8069] do not check for module files relative to the installed location


From: gavinsmith0123
Subject: [8069] do not check for module files relative to the installed location
Date: Wed, 15 Aug 2018 08:43:35 -0400 (EDT)

Revision: 8069
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8069
Author:   gavin
Date:     2018-08-15 08:43:35 -0400 (Wed, 15 Aug 2018)
Log Message:
-----------
do not check for module files relative to the installed location

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-08-15 12:09:43 UTC (rev 8068)
+++ trunk/ChangeLog     2018-08-15 12:43:35 UTC (rev 8069)
@@ -1,5 +1,10 @@
 2018-08-15  Gavin Smith  <address@hidden>
 
+       * tp/texi2any.pl: Do not check for module files relative to the
+       installed location.
+
+2018-08-15  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/ModulePath.pm.in: Do not account for the case of 
        one of $top_builddir and $top_srcdir being set but not the 
        other.

Modified: trunk/tp/texi2any.pl
===================================================================
--- trunk/tp/texi2any.pl        2018-08-15 12:09:43 UTC (rev 8068)
+++ trunk/tp/texi2any.pl        2018-08-15 12:43:35 UTC (rev 8069)
@@ -78,15 +78,6 @@
     # Look for modules in their installed locations.
 
     my $lib_dir = File::Spec->catdir($datadir, $package);
-
-    # try to make package relocatable, will only work if
-    # standard relative paths are used
-    if (! -f File::Spec->catfile($lib_dir, 'Texinfo', 'Parser.pm')
-        and -f File::Spec->catfile($command_directory, $updir, 'share', 
-                                   'texinfo', 'Texinfo', 'Parser.pm')) {
-      $lib_dir = File::Spec->catdir($command_directory, $updir, 
-                                          'share', 'texinfo');
-    }
     unshift @INC, $lib_dir;
 
     require Texinfo::ModulePath;




reply via email to

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