[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[6771] look in srcdir for perl modules
From: |
Gavin D. Smith |
Subject: |
[6771] look in srcdir for perl modules |
Date: |
Mon, 09 Nov 2015 22:44:50 +0000 |
Revision: 6771
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6771
Author: gavin
Date: 2015-11-09 22:44:49 +0000 (Mon, 09 Nov 2015)
Log Message:
-----------
look in srcdir for perl modules
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/texi2any.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2015-11-09 19:32:30 UTC (rev 6770)
+++ trunk/ChangeLog 2015-11-09 22:44:49 UTC (rev 6771)
@@ -1,5 +1,10 @@
2015-11-09 Gavin Smith <address@hidden>
+ * tp/texi2any.pl: Use srcdir as well as builddir to set module
+ search path.
+
+2015-11-09 Gavin Smith <address@hidden>
+
* tp/texi2any.pl: Add 'use Texinfo::Convert::Converter' as this
module may not be loaded.
Modified: trunk/tp/texi2any.pl
===================================================================
--- trunk/tp/texi2any.pl 2015-11-09 19:32:30 UTC (rev 6770)
+++ trunk/tp/texi2any.pl 2015-11-09 22:44:49 UTC (rev 6771)
@@ -36,8 +36,6 @@
# for carp
#use Carp;
-use Texinfo::Convert::Converter;
-
Getopt::Long::Configure("gnu_getopt");
# This big BEGIN block deals with finding modules and
@@ -63,12 +61,15 @@
or defined($ENV{'TEXINFO_DEV_SOURCE'})
and $ENV{'TEXINFO_DEV_SOURCE'} ne '0')
{
+ # Use uninstalled modules
+
+ # To find Texinfo::ModulePath
if (!defined($ENV{'top_builddir'})) {
$ENV{'top_builddir'} = File::Spec->catdir($command_directory, $updir);
}
- # In-source run.
- my $lib_dir = File::Spec->catdir($ENV{'top_builddir'}, 'tp');
+ unshift @INC, File::Spec->catdir($ENV{'top_builddir'}, 'tp');
+ my $lib_dir = File::Spec->catdir($ENV{'top_srcdir'}, 'tp');
unshift @INC, $lib_dir;
require Texinfo::ModulePath;
@@ -104,6 +105,7 @@
use Locale::Messages;
use Texinfo::Common;
+use Texinfo::Convert::Converter;
my ($real_command_name, $command_directory, $command_suffix)
= fileparse($0, '.pl');
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [6771] look in srcdir for perl modules,
Gavin D. Smith <=