[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13.2-333-ga8b0276

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=a8b0276b20fdc88a9a86a8d2eda208cf17adf456

The branch, master has been updated
       via  a8b0276b20fdc88a9a86a8d2eda208cf17adf456 (commit)
       via  455d0f33b1540e75006cbf267cd7bda1a70eb5bc (commit)
      from  7a57be384d484aef09de08038769985f32935f2f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a8b0276b20fdc88a9a86a8d2eda208cf17adf456
Merge: 7a57be3 455d0f3
Author: Stefano Lattarini <address@hidden>
Date:   Thu May 30 10:35:46 2013 +0200

    Merge branch 'fix-pr14499'
    
    * fix-pr14499:
      tests: avoid a spurious failure when TeX is not installed.

commit 455d0f33b1540e75006cbf267cd7bda1a70eb5bc
Author: Stefano Lattarini <address@hidden>
Date:   Wed May 29 11:41:09 2013 +0200

    tests: avoid a spurious failure when TeX is not installed.
    
    Fixes automake bug#14499.
    
    * t/txinfo-no-split.sh: If TeX is not available, redefine 'dvi' to be a
    dummy target, so that "make distcheck" doesn't fail while trying to build
    the DVI version of the Texinfo manual.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 t/txinfo-no-split.sh |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/t/txinfo-no-split.sh b/t/txinfo-no-split.sh
index aecf7e7..6a50f1c 100644
--- a/t/txinfo-no-split.sh
+++ b/t/txinfo-no-split.sh
@@ -34,6 +34,13 @@ check-local:
        test "`find $(srcdir) . | grep '\.info'`" = "$(srcdir)/foo.info"
 END
 
+# Systems lacking a working TeX installation cannot run "make dvi".
+if test -z "$TEX"; then
+  warn_ "TeX installation missing, \"make dvi\" will be skipped"
+  echo AUTOMAKE_OPTIONS = -Wno-override >> Makefile.am
+  echo 'dvi:; @echo Tex is missing, do nothing' >> Makefile.am
+fi
+
 cat > foo.texi << 'END'
 \input texinfo
 @setfilename foo.info


hooks/post-receive
-- 
GNU Automake