[5243] no .exe for makeinfo(.1)

[karl]

Revision: 5243
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5243
Author:   karl
Date:     2013-03-20 23:05:29 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
no .exe for makeinfo(.1)

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/man/Makefile.am

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2013-03-16 18:37:07 UTC (rev 5242)
+++ trunk/ChangeLog     2013-03-20 23:05:29 UTC (rev 5243)
@@ -1,3 +1,9 @@
+2013-03-20  Karl Berry  <address@hidden>
+
+       * man/Makefile.am (man_rule_0): set EXEEXT="" since it's
+       no longer an executable.  Report from Eli, 20 Mar 2013 20:47:52.
+       (mi_perl5lib): set up another variable to shorten source lines.
+
 2013-03-16  Patrice Dumas  <address@hidden>
 
        * tp/Texinfo/Parser.pm (_parse_texi): accept the same 

Modified: trunk/man/Makefile.am
===================================================================
--- trunk/man/Makefile.am       2013-03-16 18:37:07 UTC (rev 5242)
+++ trunk/man/Makefile.am       2013-03-20 23:05:29 UTC (rev 5243)
@@ -42,13 +42,15 @@
 MAKEINFO = $(PERL) -I "$(tpdir)" "$(tpdir)"/texi2any.pl
 #
 tplibdir = $(tpdir)/maintain/lib
-mi_perl5lib = 
"$(tpdir):$(tplibdir)/libintl-perl/lib:$(tplibdir)/Unicode-EastAsianWidth/lib:$(tplibdir)/Text-Unidecode/lib"
+mi_perl5lib_path = 
"$(tpdir):$(tplibdir)/libintl-perl/lib:$(tplibdir)/Unicode-EastAsianWidth/lib:$(tplibdir)/Text-Unidecode/lib"
+mi_perl5lib = PERL5LIB=$(mi_perl5lib_path); export PERL5LIB
 
-# Set up the variables:
+# Set up the variables.  makeinfo is no longer a .exe(cutable).
 man_rule_0 = \
-  program=`expr '/$@' : '.*/\(.*\)\.1'` \
+  exe_ext="$(EXEEXT)" \
+  && program=`expr '/$@' : '.*/\(.*\)\.1'` \
   && case $$program in \
-         makeinfo) dir=tp; PERL5LIB=$(mi_perl5lib); export PERL5LIB;; \
+         makeinfo) dir=tp; $(mi_perl5lib); exe_ext="";; \
             info*) dir=info; test $$program != info || program=g$$program;; \
     *install-info) dir=install-info; program=g$$program;; \
                 *) dir=util;; esac \
@@ -59,8 +61,8 @@
 # make sure the binary is up-to-date and then generate the man page.
 man_rule_bin = echo "Updating man page $@" \
   && $(man_rule_0) \
-  && echo cd "$$dir" '&&' $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT) \
-  &&     (cd "$$dir"  &&  $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT)) \
+  && echo cd "$$dir" '&&' $(MAKE) $(AM_MAKEFLAGS) $$program$$exe_ext \
+  &&     (cd "$$dir"  &&  $(MAKE) $(AM_MAKEFLAGS) $$program$$exe_ext) \
   && echo $(HELP2MAN) --name=\""$$name"\" -I "$$h2m" "$$dir/$$program" -o '$@'\
   &&      $(HELP2MAN) --name="$$name"     -I "$$h2m" "$$dir/$$program" -o '$@'