texinfo/tp MANIFEST texi2any.pl

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/03/02 22:37:33

Modified files:
        tp             : MANIFEST texi2any.pl 

Log message:
        Add the path to the Texinfo modules at runtime too.  Karl proposal.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/MANIFEST?cvsroot=texinfo&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.121&r2=1.122

Patches:
Index: MANIFEST
===================================================================
RCS file: /sources/texinfo/texinfo/tp/MANIFEST,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- MANIFEST    24 Feb 2012 00:02:41 -0000      1.36
+++ MANIFEST    2 Mar 2012 22:37:33 -0000       1.37
@@ -52,9 +52,11 @@
 t/70value_and_macro.t
 t/80include.t
 t/accents.t
+t/automatic_menus.t
 t/automatic_nodes.t
 t/converters_tests.t
 t/docbook_tests.t
+t/do_master_menu.t
 texi2any
 Texinfo/Common.pm
 Texinfo/Convert/Converter.pm

Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- texi2any.pl 26 Feb 2012 22:01:48 -0000      1.121
+++ texi2any.pl 2 Mar 2012 22:37:33 -0000       1.122
@@ -44,8 +44,6 @@
         and $texinfolibdir ne '@' .'datadir@/@PACKAGE'.'@');
 }
 
-use Texinfo::Convert::Texinfo;
-
 my $real_command_name = $0;
 $real_command_name =~ s/.*\///;
 $real_command_name =~ s/\.pl$//;
@@ -112,6 +110,14 @@
 }
 
 my $srcdir = defined $ENV{'srcdir'} ? $ENV{'srcdir'} : dirname $0;
+
+if (($0 =~ /\.pl$/ and !(defined($ENV{'TEXINFO_DEV_SOURCE'})
+     and $ENV{'TEXINFO_DEV_SOURCE'} eq 0)) or $ENV{'TEXINFO_DEV_SOURCE'}) {
+  unshift @INC, $srcdir;
+}
+
+require Texinfo::Convert::Texinfo;
+
 my $libsrcdir = "$srcdir/maintain";
 if (($0 =~ /\.pl$/ and !(defined($ENV{'TEXINFO_DEV_SOURCE'}) 
      and $ENV{'TEXINFO_DEV_SOURCE'} eq 0)) or $ENV{'TEXINFO_DEV_SOURCE'}) {
@@ -934,6 +940,8 @@
     if (defined(get_conf($parser_settable_option)));
 }
 
+# this is very wrong, but a way to avoid a spurious warning.
+no warnings 'once';
 foreach my $parser_option (@Texinfo::Common::parser_options) {
   $parser_default_options->{lc($parser_option)} = get_conf($parser_option)
     if (defined(get_conf($parser_option)));