[5344] only run biber if bcf is complete; allow BIBER override

[karl]

Revision: 5344
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5344
Author:   karl
Date:     2013-08-26 21:21:15 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
only run biber if bcf is complete; allow BIBER override

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/util/texi2dvi

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2013-08-25 23:04:48 UTC (rev 5343)
+++ trunk/ChangeLog     2013-08-26 21:21:15 UTC (rev 5344)
@@ -1,3 +1,10 @@
+2013-08-26  Karl Berry  <address@hidden>
+
+       * util/texi2dvi (run_bibtex): only run biber if
+       </bcf:controlfile> is present in the bcf file.
+       Allow override with BIBER envvar.
+       Report from Jozef Vesely, 26 Aug 2013 14:26:26.
+
 2013-08-26  Patrice Dumas  <address@hidden>
 
        * tp/Texinfo/Convert/Plaintext.pm (_align_lines): correct byte count

Modified: trunk/util/texi2dvi
===================================================================
--- trunk/util/texi2dvi 2013-08-25 23:04:48 UTC (rev 5343)
+++ trunk/util/texi2dvi 2013-08-26 21:21:15 UTC (rev 5344)
@@ -391,7 +391,7 @@
 using \\graphicspath): in that case, use -I to specify the additional
 directories to consider.
 
-The values of the BIBTEX, DVIPDF, DVIPS, HEVEA, LATEX, MAKEINDEX,
+The values of the BIBER, BIBTEX, DVIPDF, DVIPS, HEVEA, LATEX, MAKEINDEX,
 MAKEINFO, PDFLATEX, PDFTEX, T4HT, TEX, TEX4HT, TEXINDEX, and THUMBPDF
 environment variables are used to run those commands, if they are set.
 
@@ -1116,8 +1116,9 @@
   fi
 
   # biber(+biblatex) check.
-  if test -r "$in_noext.bcf"; then
-    run biber "$in_noext"
+  if test -r "$in_noext.bcf" \
+     && grep '</bcf:controlfile>' "$in_noext.bcf" >/dev/null; then
+    run ${BIBER:-biber} "$in_noext"
   fi
 }