texk/web2c: Output from convert is (non)verbose

git-svn-id: svn://tug.org/texlive/trunk@32547 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 22 insertions, 11 deletions

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 82ca40b6af1..4f22f9e6a66 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -3,6 +3,8 @@
 	* ac/web2c.ac, configure.ac: Use X toolkit for METAFONT only if
 	requested explicitly.
 
+	* Makefile.am, web2c-sh.in: Output from convert is (non)verbose.
+
 2013-12-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* vptovf.ch: Use make_suffix() for implied tfm_name.
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index daecdb0e460..3e65ceb78ad 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -40,7 +40,7 @@ dist-hook:
 NEVER_DIST = `find . -name .svn`
 
 ## The sh script that does the conversion.
-web2c = $(SHELL) ./web2c-sh $@
+web2c = AM_V_P=$(AM_V_P) $(SHELL) ./web2c-sh $@
 
 ## We put this in the web2c directory because it runs on the build system, it
 ## is separate from (and simpler than) the actual web-to-C conversion programs.
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index a453046a90c..132b1c8a533 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -2043,7 +2043,7 @@ uninstall_exe_links = $(am__append_21) $(am__append_62)
 NEVER_DIST = `find . -name .svn` cwebdir/cweave.log cwebdir/cweave.trs \
 	ctiedir/ctie.log ctiedir/ctie.trs tiedir/tie.log \
 	tiedir/tie.trs
-web2c = $(SHELL) ./web2c-sh $@
+web2c = AM_V_P=$(AM_V_P) $(SHELL) ./web2c-sh $@
 makecpool = $(AM_V_GEN)web2c/makecpool
 
 # Additional dependencies:
diff --git a/Build/source/texk/web2c/web2c-sh.in b/Build/source/texk/web2c/web2c-sh.in
index bff620a0094..beab55e08a2 100644
--- a/Build/source/texk/web2c/web2c-sh.in
+++ b/Build/source/texk/web2c/web2c-sh.in
@@ -1,7 +1,7 @@
 #! @SHELL@
 # web2c-sh: shell script to invoke ${srcdir}/web2c/convert.
 #
-#   Copyright (C) 2009, 2012 Peter Breitenlohner <tex-live@tug.org>
+#   Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
 #
 #   This file is free software; the copyright holder
 #   gives unlimited permission to copy and/or distribute it,
@@ -23,15 +23,27 @@
 srcdir=@srcdir@; export srcdir
 target=$1
 base=$2
+
+do_convert () {
+  echo timestamp >$stamp.tmp
+  if $AM_V_P; then
+    echo "@SHELL@ $srcdir/web2c/convert $base"
+    @SHELL@ $srcdir/web2c/convert $base || exit 1
+  else
+    echo "  WEB2C   " $base
+    @SHELL@ $srcdir/web2c/convert $base >$base.out 2>&1; rc=$?
+    test $rc -eq 0 || { cat $base.out; exit $rc; }
+    rm -f $base.out
+  fi
+  mv -f $stamp.tmp $stamp
+}
+
 stamp=$base-web2c
 case $target in
   $stamp)
     # Normal build.
     rm -f $stamp.tmp
-    echo timestamp >$stamp.tmp
-    echo "  WEB2C   " $base
-    @SHELL@ $srcdir/web2c/convert $base || exit 1
-    mv -f $stamp.tmp $stamp
+    do_convert
   ;;
   *)
     # Recover from removal of $target
@@ -40,10 +52,7 @@ case $target in
     if mkdir $stamp.lock 2>/dev/null; then
       # Code executed by the first process.
       rm -f $stamp $stamp.tmp
-      echo timestamp >$stamp.tmp
-      echo "  WEB2C   " $base
-      @SHELL@ $srcdir/web2c/convert $base || exit 1
-      mv -f $stamp.tmp $stamp
+      do_convert
       rmdir $stamp.lock
     else
       # Code executed by the follower processes.