texinfo/tp Makefile.am texi2any.pl

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/12/25 23:49:26

Modified files:
        tp             : Makefile.am texi2any.pl 

Log message:
        Makefile.am: regenerate texi2any when configure was rerun.
        texi2any.pl: add to @INC only directories that exist.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Makefile.am?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.96&r2=1.97

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- Makefile.am 25 Dec 2011 10:57:42 -0000      1.17
+++ Makefile.am 25 Dec 2011 23:49:26 -0000      1.18
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.17 2011/12/25 10:57:42 pertusus Exp $
+# $Id: Makefile.am,v 1.18 2011/12/25 23:49:26 pertusus Exp $
 # Makefile.am for texinfo/tp.
 #
 # Copyright 2011 Free Software Foundation, Inc.
@@ -32,7 +32,7 @@
   -e 's,address@hidden@],$(USE_EXTERNAL_EASTASIANWIDTH),g' \
   -e 's,address@hidden@],$(USE_EXTERNAL_UNIDECODE),g'
 
-texi2any: texi2any.pl
+texi2any: texi2any.pl $(top_builddir)/config.status
        $(do_subst) $(srcdir)/$< >$@
        chmod a+x $@
 

Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- texi2any.pl 25 Dec 2011 12:29:33 -0000      1.96
+++ texi2any.pl 25 Dec 2011 23:49:26 -0000      1.97
@@ -113,11 +113,12 @@
 my $libsrcdir = "$srcdir/maintain";
 if ($0 =~ /\.pl$/) {
   unshift @INC, "$libsrcdir/lib/libintl-perl/lib";
-} elsif ('@USE_EXTERNAL_LIBINTL@' ne 'yes') {
+} elsif ('@USE_EXTERNAL_LIBINTL@' ne 'yes'
+         and -d "$pkgdatadir/lib/libintl-perl/lib") {
   unshift @INC, "$pkgdatadir/lib/libintl-perl/lib";
 } else {
   eval { require Locale::Messages; };
-  if ($@) {
+  if ($@ and -d "$pkgdatadir/lib/libintl-perl/lib") {
     unshift @INC, "$pkgdatadir/lib/libintl-perl/lib";
   }
 }
@@ -127,6 +128,9 @@
 # gettext.
 Locale::Messages->select_package ('gettext_pp');
 
+#my @search_locale_dirs = ("$datadir/locale", (map $_ . '/LocaleData', @INC),
+#  qw (/usr/share/locale /usr/local/share/locale));
+
 if ($0 =~ /\.pl$/) {
   # in case of build from the source directory, out of source build, 
   # this helps to locate the locales.
@@ -150,11 +154,12 @@
 
 if ($0 =~ /\.pl$/) {
   unshift @INC, "$libsrcdir/lib/Unicode-EastAsianWidth/lib";
-} elsif ('@USE_EXTERNAL_EASTASIANWIDTH@' ne 'yes') {
+} elsif ('@USE_EXTERNAL_EASTASIANWIDTH@' ne 'yes'
+         and -d "$pkgdatadir/lib/Unicode-EastAsianWidth/lib") {
   unshift @INC, "$pkgdatadir/lib/Unicode-EastAsianWidth/lib";
 } else {
   eval { require Unicode::EastAsianWidth; };
-  if ($@) {
+  if ($@ and -d "$pkgdatadir/lib/Unicode-EastAsianWidth/lib") {
     unshift @INC, "$pkgdatadir/lib/Unicode-EastAsianWidth/lib";
   }
 }
@@ -162,11 +167,12 @@
 
 if ($0 =~ /\.pl$/) {
   unshift @INC, "$libsrcdir/lib/Text-Unidecode/lib";
-} elsif ('@USE_EXTERNAL_UNIDECODE@' ne 'yes') {
+} elsif ('@USE_EXTERNAL_UNIDECODE@' ne 'yes'
+          and "$pkgdatadir/lib/Text-Unidecode/lib") {
   unshift @INC, "$pkgdatadir/lib/Text-Unidecode/lib";
 } else {
   eval { require Text::Unidecode; };
-  if ($@) {
+  if ($@ and -d "$pkgdatadir/lib/Text-Unidecode/lib") {
     unshift @INC, "$pkgdatadir/lib/Text-Unidecode/lib";
   }
 }