texinfo Pod-Simple-Texinfo/.cvsignore Pod-Simpl...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/11/19 23:54:10

Modified files:
        Pod-Simple-Texinfo: .cvsignore Makefile.PL Makefile.am README 
                            pod2texi.pl 
        util           : Makefile.am txixml2texi.pl 

Log message:
        Do not include the path of the external modules we ship if the user 
        do not want to.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/Pod-Simple-Texinfo/.cvsignore?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/Pod-Simple-Texinfo/Makefile.PL?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/Pod-Simple-Texinfo/Makefile.am?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/Pod-Simple-Texinfo/README?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/Pod-Simple-Texinfo/pod2texi.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/Makefile.am?cvsroot=texinfo&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/txixml2texi.pl?cvsroot=texinfo&r1=1.3&r2=1.4

Patches:
Index: Pod-Simple-Texinfo/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/Pod-Simple-Texinfo/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Pod-Simple-Texinfo/.cvsignore       10 Nov 2012 16:59:02 -0000      1.2
+++ Pod-Simple-Texinfo/.cvsignore       19 Nov 2012 23:54:08 -0000      1.3
@@ -3,3 +3,5 @@
 Makefile.in
 Makefile
 pod2texi
+blib
+pm_to_blib

Index: Pod-Simple-Texinfo/Makefile.PL
===================================================================
RCS file: /sources/texinfo/texinfo/Pod-Simple-Texinfo/Makefile.PL,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Pod-Simple-Texinfo/Makefile.PL      12 Sep 2012 00:40:25 -0000      1.3
+++ Pod-Simple-Texinfo/Makefile.PL      19 Nov 2012 23:54:08 -0000      1.4
@@ -5,7 +5,7 @@
 WriteMakefile(
     NAME              => 'Pod::Simple::Texinfo',
     VERSION_FROM      => 'lib/Pod/Simple/Texinfo.pm', # finds $VERSION
-    EXE_FILES         => [ 'pod2texi.pl' ],
+    EXE_FILES         => [ 'pod2texi' ],
     PREREQ_PM         => { "Pod::Simple::PullParser" => 0,
                            "Texinfo::Parser" => 0,
                            "Getopt::Long" => 0,

Index: Pod-Simple-Texinfo/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/Pod-Simple-Texinfo/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- Pod-Simple-Texinfo/Makefile.am      17 Nov 2012 19:13:37 -0000      1.6
+++ Pod-Simple-Texinfo/Makefile.am      19 Nov 2012 23:54:09 -0000      1.7
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.6 2012/11/17 19:13:37 pertusus Exp $
+# $Id: Makefile.am,v 1.7 2012/11/19 23:54:09 pertusus Exp $
 # Makefile.am for texinfo/Pod-Simple_Texinfo.
 # Copyright 2012 Free Software Foundation, Inc.
 #
@@ -28,7 +28,11 @@
 
 pod2texi: pod2texi.pl Makefile
        sed -e 's,address@hidden@],$(datadir),g' \
-       -e 's,address@hidden@],$(PACKAGE),g' $(srcdir)/pod2texi.pl >$@
+       -e 's,address@hidden@],$(PACKAGE),g' \
+       -e 's,address@hidden@],$(USE_EXTERNAL_LIBINTL),g' \
+       -e 's,address@hidden@],$(USE_EXTERNAL_EASTASIANWIDTH),g' \
+       -e 's,address@hidden@],$(USE_EXTERNAL_UNIDECODE),g' \
+          $(srcdir)/pod2texi.pl >$@
        chmod a+x $@
 
 if POD_SIMPLE_TEXINFO_TESTS

Index: Pod-Simple-Texinfo/README
===================================================================
RCS file: /sources/texinfo/texinfo/Pod-Simple-Texinfo/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Pod-Simple-Texinfo/README   19 Jan 2012 20:03:12 -0000      1.1
+++ Pod-Simple-Texinfo/README   19 Nov 2012 23:54:09 -0000      1.2
@@ -20,12 +20,12 @@
 
 COPYRIGHT AND LICENCE
 
-Copyright (C) 2011 Patrice Dumas
+Copyright (C) 2011, 2012 Free Software Foundation, Inc.
 
-This library is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
+This library is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License,
+or (at your option) any later version.
 
-This program is distributed in the hope that it will be useful, but
-without any warranty; without even the implied warranty of
-merchantability or fitness for a particular purpose.
+_url_escape is general_url_escape from Pod::Simple::HTML.
 

Index: Pod-Simple-Texinfo/pod2texi.pl
===================================================================
RCS file: /sources/texinfo/texinfo/Pod-Simple-Texinfo/pod2texi.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- Pod-Simple-Texinfo/pod2texi.pl      12 Sep 2012 00:40:25 -0000      1.18
+++ Pod-Simple-Texinfo/pod2texi.pl      19 Nov 2012 23:54:09 -0000      1.19
@@ -45,10 +45,16 @@
     unshift @INC, (File::Spec->catdir($srcdir, 'lib'), $tpdir);
   }
   if (defined($dir)) {
-    unshift @INC, (
-        File::Spec->catdir($dir, 'lib', 'libintl-perl', 'lib'), 
-        File::Spec->catdir($dir, 'lib', 'Unicode-EastAsianWidth', 'lib'),
-        File::Spec->catdir($dir, 'lib', 'Text-Unidecode', 'lib'));
+    if ('@USE_EXTERNAL_LIBINTL@' ne 'yes') {
+      unshift @INC, File::Spec->catdir($dir, 'lib', 'libintl-perl', 'lib');
+    }
+    if ('@USE_EXTERNAL_EASTASIANWIDTH@' ne 'yes') {
+      unshift @INC, File::Spec->catdir($dir, 'lib', 
+                                            'Unicode-EastAsianWidth', 'lib');
+    }
+    if ('@USE_EXTERNAL_UNIDECODE@' ne 'yes') {
+      unshift @INC, File::Spec->catdir($dir, 'lib', 'Text-Unidecode', 'lib');
+    }
   }
 }
 use Pod::Simple::Texinfo;

Index: util/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/util/Makefile.am,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- util/Makefile.am    11 Nov 2012 00:44:37 -0000      1.47
+++ util/Makefile.am    19 Nov 2012 23:54:09 -0000      1.48
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.47 2012/11/11 00:44:37 karl Exp $
+# $Id: Makefile.am,v 1.48 2012/11/19 23:54:09 pertusus Exp $
 # Makefile.am for texinfo/util.
 # Run automake in .. to produce Makefile.in from this.
 #
@@ -23,7 +23,12 @@
 
 txixml2texi: txixml2texi.pl Makefile
        sed -e 's,address@hidden@],$(datadir),g' \
-           -e 's,address@hidden@],$(PACKAGE),g' $(srcdir)/txixml2texi.pl >$@
+       sed -e 's,address@hidden@],$(datadir),g' \
+       -e 's,address@hidden@],$(PACKAGE),g' \
+       -e 's,address@hidden@],$(USE_EXTERNAL_LIBINTL),g' \
+       -e 's,address@hidden@],$(USE_EXTERNAL_EASTASIANWIDTH),g' \
+       -e 's,address@hidden@],$(USE_EXTERNAL_UNIDECODE),g' \
+          $(srcdir)/txixml2texi.pl >$@
        chmod a+x $@
 
 localedir = $(datadir)/locale

Index: util/txixml2texi.pl
===================================================================
RCS file: /sources/texinfo/texinfo/util/txixml2texi.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- util/txixml2texi.pl 12 Sep 2012 00:40:25 -0000      1.3
+++ util/txixml2texi.pl 19 Nov 2012 23:54:09 -0000      1.4
@@ -44,10 +44,16 @@
     unshift @INC, $tpdir;
   }
   if (defined($dir)) {
-    unshift @INC, (
-        File::Spec->catdir($dir, 'lib', 'libintl-perl', 'lib'),
-        File::Spec->catdir($dir, 'lib', 'Unicode-EastAsianWidth', 'lib'),
-        File::Spec->catdir($dir, 'lib', 'Text-Unidecode', 'lib'));
+    if ('@USE_EXTERNAL_LIBINTL@' ne 'yes') {
+      unshift @INC, File::Spec->catdir($dir, 'lib', 'libintl-perl', 'lib');
+    }
+    if ('@USE_EXTERNAL_EASTASIANWIDTH@' ne 'yes') {
+      unshift @INC, File::Spec->catdir($dir, 'lib', 
+                                            'Unicode-EastAsianWidth', 'lib');
+    }
+    if ('@USE_EXTERNAL_UNIDECODE@' ne 'yes') {
+      unshift @INC, File::Spec->catdir($dir, 'lib', 'Text-Unidecode', 'lib');
+    }
   }
 }