texinfo/doc Makefile.am

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/02/17 18:54:31

Modified files:
        doc            : Makefile.am 

Log message:
        Use texi2any to convert to info, without the .pl, and pass paths 
accordingly.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/Makefile.am?cvsroot=texinfo&r1=1.46&r2=1.47

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/doc/Makefile.am,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- Makefile.am 10 Feb 2012 10:29:35 -0000      1.46
+++ Makefile.am 17 Feb 2012 18:54:30 -0000      1.47
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.46 2012/02/10 10:29:35 pertusus Exp $
+# $Id: Makefile.am,v 1.47 2012/02/17 18:54:30 pertusus Exp $
 # Makefile.am for texinfo/doc.
 #
 # Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
@@ -20,7 +20,9 @@
 
 # Use the programs built in our distribution, taking account of possible
 # cross-compiling.
-MAKEINFO = $(PERL) -I $(top_srcdir)/tp/ $(top_srcdir)/tp/texi2any.pl
+tpdir = $(top_srcdir)/tp
+tplibdir = $(tpdir)/maintain/lib
+MAKEINFO = $(PERL) -I "$(tpdir)" -I "$(tplibdir)/libintl-perl/lib" -I 
"$(tplibdir)/Unicode-EastAsianWidth/lib" -I "$(tplibdir)/Text-Unidecode/lib" 
$(top_builddir)/tp/texi2any
 
 # We'd also like to use something like this, but Automake calls
 # "install-info" directly.