automake-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.1


From: Stefano Lattarini
Subject: [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.1-426-gd1f62f1
Date: Wed, 20 Jun 2012 14:48:13 +0000

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=d1f62f1f5645f460eb1a53edb4b15ea33ea041cb

The branch, ng/master has been updated
       via  d1f62f1f5645f460eb1a53edb4b15ea33ea041cb (commit)
       via  aa9036d432c0c8a671800ceb172303cd9a933e31 (commit)
       via  9c22243af8307cd11923b3373314a5c7723d7c6d (commit)
       via  3c64d54cba6c3dbc09953b50a511e50f8e749421 (commit)
       via  32d81dcd41d33c3e31fe64c243946570b2d400d3 (commit)
       via  205c7572497789676bea3167b9cdeede69236a16 (commit)
       via  ffe04c8d92d775712e6e574103215eb863adfb29 (commit)
      from  6d02bf85a2b851f7519d96dafaa6e9b1f1588bad (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 d1f62f1f5645f460eb1a53edb4b15ea33ea041cb
Author: Stefano Lattarini <address@hidden>
Date:   Wed Jun 20 16:39:44 2012 +0200

    [ng] maintcheck: remove a test that can't work for Automake-NG
    
    * syntax-checks.mk (sc_tests_makefile_variable_order): Remove.  This
    rule checked that all variables definitions were listed before rules
    in the automake-generated Makefile.in files; but this invariant is not
    guaranteed anymore by Automake-NG, and in fact it will break more and
    more as our work proceeds.
    (syntax_check_rules): Update.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit aa9036d432c0c8a671800ceb172303cd9a933e31
Merge: 6d02bf8 9c22243
Author: Stefano Lattarini <address@hidden>
Date:   Wed Jun 20 14:25:19 2012 +0200

    Merge branch 'master' into ng/master
    
    * master:
      maintcheck: guard against obsolete $required entries
      tests: drop requirement 'makeinfo-html'; 'makeinfo' is enough
      tests: drop requirement 'texi2dvi-o'; 'texi2dvi' is enough
      texi: require Texinfo >= 4.9, related enhancements
      docs: it's not true that DISTCHECK_CONFIGURE_FLAGS is maintainer-reserved
    
    + Extra non-trivial edits:
    
    * t/silent-texi.sh ($required): Simply use 'makeinfo and 'texi2dvi',
    instead of (respectively) 'makeinfo-html' and 'texi2dvi-o'.
    * t/texinfo21b.sh: Fix a minor typo in heading comments.
    ($required): Simply use 'makeinfo instead of 'makeinfo-html'
    * lib/am/texibuild.am: Merge the changes done in the master branch to
    the ".texi -> .dvi" and ".texi -> .pdf" recipes into the definition
    of the '$(am__texibuild_dvi_or_pdf)' make function, as well as into ...
    (%.dvi: %.texi), (%.pdf: %.texi): ... calls to that function into these
    pattern rules.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 .gitignore             |    2 +
 NEWS                   |   10 +++++++++
 automake.in            |   49 ++++++-----------------------------------------
 defs                   |    6 -----
 doc/automake-ng.texi   |   10 +++-----
 lib/am/texibuild.am    |   24 ++++++++++++++--------
 lib/am/texinfos.am     |   11 +++++----
 syntax-checks.mk       |   37 +++++++++++++----------------------
 t/instdir-texi.sh      |    2 +-
 t/silent-texi.sh       |    2 +-
 t/txinfo-no-clutter.sh |    5 ++-
 t/txinfo13.sh          |    2 +-
 t/txinfo21.sh          |    2 +-
 t/txinfo21b.sh         |    4 +-
 t/txinfo23.sh          |    2 +-
 t/txinfo24.sh          |    2 +-
 t/txinfo25.sh          |    2 +-
 t/txinfo28.sh          |    2 +-
 t/txinfo33.sh          |    2 +-
 t/vtexi4.sh            |    2 +-
 20 files changed, 73 insertions(+), 105 deletions(-)

diff --git a/.gitignore b/.gitignore
index b8b2951..e7af2a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,8 @@
 /doc/automake*.dvi
 /doc/automake*.pdf
 /doc/automake*.ps
+/doc/automake*.t2d/
+/doc/automake*.t2p/
 /doc/automake*.1
 /doc/aclocal*.1
 /doc/stamp-vti
diff --git a/NEWS b/NEWS
index 33812db..6df5fcd 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@ New in 1.13:
 
   - Autoconf 2.65 or greater is required.
 
+  - The rules to build PDF and DVI output from Texinfo input now
+    requires Texinfo 4.9 or later.
+
 * Obsolete features removed:
 
   - Use of the long-deprecated two- and three-arguments invocation forms
@@ -56,6 +59,13 @@ New in 1.13:
     backward-compatibility only.  In particular, its use does not disable
     the warnings in the 'portability-recursive' category anymore.
 
+* Texinfo Support:
+
+  - The rules to build PDF and DVI files from Texinfo input now use the
+    ' --build-dir' option, to keep the auxiliary files used by texi2dvi
+    and texi2pdf around without cluttering the build directory, and to
+    make it possible to run the "dvi" and "pdf" recipes in parallel.
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 New in 1.12.2:
diff --git a/automake.in b/automake.in
index b518ffa..6932bf5 100644
--- a/automake.in
+++ b/automake.in
@@ -2738,35 +2738,15 @@ sub handle_scripts
 ## Handling Texinfo files.  ##
 ## ------------------------ ##
 
-# ($OUTFILE, $VFILE, @CLEAN_FILES)
+# ($OUTFILE, $VFILE)
 # &scan_texinfo_file ($FILENAME)
 # ------------------------------
 # $OUTFILE     - name of the info file produced by $FILENAME.
 # $VFILE       - name of the version.texi file used (undef if none).
-# @CLEAN_FILES - list of byproducts (indexes etc.)
 sub scan_texinfo_file ($)
 {
   my ($filename) = @_;
 
-  # Some of the following extensions are always created, no matter
-  # whether indexes are used or not.  Other (like cps, fns, ... pgs)
-  # are only created when they are used.  We used to scan $FILENAME
-  # for their use, but that is not enough: they could be used in
-  # included files.  We can't scan included files because we don't
-  # know the include path.  Therefore we always erase these files, no
-  # matter whether they are used or not.
-  #
-  # (tmp is only created if an @macro is used and a certain e-TeX
-  # feature is not available.)
-  my %clean_suffixes =
-    map { $_ => 1 } (qw(aux log toc tmp
-                       cp cps
-                       fn fns
-                       ky kys
-                       vr vrs
-                       tp tps
-                       pg pgs)); # grep 'new.*index' texinfo.tex
-
   my $texi = new Automake::XFile "< $filename";
   verb "reading $filename";
 
@@ -2794,23 +2774,6 @@ sub scan_texinfo_file ($)
        {
          $vfile = $1;
        }
-
-      # Try to find new or unused indexes.
-
-      # Creating a new category of index.
-      elsif (/address@hidden(code)?index (\w+)/)
-       {
-         $clean_suffixes{$2} = 1;
-         $clean_suffixes{"$2s"} = 1;
-       }
-
-      # Merging an index into an another.
-      elsif (/address@hidden(code)?index (\w+) (\w+)/)
-       {
-         delete $clean_suffixes{"$2s"};
-         $clean_suffixes{"$3s"} = 1;
-       }
-
     }
 
   if (! $outfile)
@@ -2821,8 +2784,7 @@ sub scan_texinfo_file ($)
 
   my $infobase = basename ($filename);
   $infobase =~ s/\.texi$//;
-  return ($outfile, $vfile,
-         map { "$infobase.$_" } (sort keys %clean_suffixes));
+  return ($outfile, $vfile);
 }
 
 # ($MOSTLYCLEAN, $TEXICLEAN, $MAINTCLEAN)
@@ -2863,10 +2825,13 @@ sub handle_texinfo_helper ($)
 
       # If 'version.texi' is referenced by input file, then include
       # automatic versioning capability.
-      my ($out_file, $vtexi, @clean_files) =
+      my ($out_file, $vtexi) =
        scan_texinfo_file ("$relative_dir/$texi")
        or next;
-      push (@mostly_cleans, @clean_files);
+      # Directory of auxiliary files and build by-products used by texi2dvi
+      # and texi2pdf.
+      push @mostly_cleans, "$relative_dir/$infobase.t2d";
+      push @mostly_cleans, "$relative_dir/$infobase.t2p";
 
       # If the Texinfo source is in a subdirectory, create the
       # resulting info in this subdirectory.  If it is in the current
diff --git a/defs b/defs
index 4b2e086..dfaebc1 100644
--- a/defs
+++ b/defs
@@ -808,12 +808,6 @@ do
         skip_all_ "TeX is required, but it wasn't found by configure"
       fi
       ;;
-    texi2dvi-o)
-      # Texi2dvi supports '-o' since Texinfo 4.1.
-      echo "$me: running texi2dvi -o /dev/null --version"
-      texi2dvi -o /dev/null --version \
-        || skip_all_ "required program 'texi2dvi' not available"
-      ;;
     lex)
       test x"$LEX" = x"false" && skip_all_ "lex not found or disabled"
       export LEX
diff --git a/doc/automake-ng.texi b/doc/automake-ng.texi
index 23749b5..c96b66e 100644
--- a/doc/automake-ng.texi
+++ b/doc/automake-ng.texi
@@ -12139,12 +12139,10 @@ DejaGnu tests (@pxref{DejaGnu Tests}) use 
@code{RUNTESTDEFAULTFLAGS} and
 (@pxref{Java}) use @code{JAVACFLAGS} and @code{AM_JAVACFLAGS}.  None
 of these rules support per-target flags (yet).
 
-However you should not think that all variables ending with
address@hidden follow this convention.  For instance,
address@hidden (@pxref{Checking the Distribution}) and
address@hidden (see @ref{Rebuilding} and @ref{Local Macros}),
-are two variables that are only useful to the maintainer and have no
-user counterpart.
+However you should not think that all variables ending with @code{FLAGS}
+follow this convention.  For instance, @code{ACLOCAL_AMFLAGS} (see
address@hidden and @ref{Local Macros}) is a variable that is only
+useful to the maintainer and has no user counterpart.
 
 @code{ARFLAGS} (@pxref{A Library}) is usually defined by Automake and
 has neither @code{AM_} nor per-target cousin.
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index fcd40cf..144154a 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -27,13 +27,19 @@ define am__texibuild_dvi_or_pdf
 ## if it is in srcdir.
        MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
                              -I $(@D) -I $(srcdir)/$(@D)' \
-## texi2dvi and texi2pdf don't silence everything with -q, redirect to
-## /dev/null instead.
-## We still want -q ($(AM_V_TEXI_QUIETOPTS)) because it turns on batch
-## mode.  Use '--clean' to avoid leaving auxiliary files behind cluttering
-## the build directory (see automake bug#11146).  We should start using
-## '--tidy' when we can assume Texinf 4.9 or later.
-       $2 $(AM_V_TEXI_QUIETOPTS) --clean -o $@ $< $(AM_V_TEXI_DEVNULL_REDIRECT)
+
+## texi2dvi and  texi2pdf don't silence everything with -q, redirect
+## to /dev/null instead.  We still want -q (%TEXIQUIET%) because it
+## turns on batch mode.
+## Use '--build-dir' so that TeX and Texinfo auxiliary files and build
+## by-products are left in there, instead of cluttering the current
+## directory (see automake bug#11146).  Use a different build-dir for
+## each file (as well as distinct build-dirs for PDF and DVI files) to
+## avoid hitting a Texinfo bug that could cause a low-probability racy
+## failure when doing parallel builds; see:
+## http://lists.gnu.org/archive/html/automake-patches/2012-06/msg00073.html
+       $2 $(AM_V_TEXI_QUIETOPTS) --build-dir=$3 \
+          -o $@ $< $(AM_V_TEXI_DEVNULL_REDIRECT)
 endef
 
 define am__texibuild_info
@@ -100,9 +106,9 @@ endef
 %.info: %.texi
        $(call am__texibuild_info,$(am__info_insrc))
 %.dvi: %.texi
-       $(call am__texibuild_dvi_or_pdf,$(AM_V_TEXI2DVI),$(TEXI2DVI))
+       $(call 
am__texibuild_dvi_or_pdf,$(AM_V_TEXI2DVI),$(TEXI2DVI),$(@:.dvi=.t2d))
 %.pdf: %.texi
-       $(call am__texibuild_dvi_or_pdf,$(AM_V_TEXI2PDF),$(TEXI2PDF))
+       $(call 
am__texibuild_dvi_or_pdf,$(AM_V_TEXI2PDF),$(TEXI2PDF),$(@:.pdf=.t2p))
 %.html: %.texi
        $(call am__texibuild_html)
 
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 867174b..7393ec8 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -306,13 +306,14 @@ if %?LOCAL-TEXIS%
 .PHONY: mostlyclean-aminfo
 mostlyclean-aminfo:
 ## Use '-rf', not just '-f', because the %*CLEAN% substitutions can also
-## contain any directory created by "makeinfo --html".
+## contain any directory created by "makeinfo --html", as well as the
+## '*.t2d' and '*.t2p' directories used by texi2dvi and texi2pdf.
        -rm -rf %MOSTLYCLEAN%
 
 .PHONY clean-am: clean-aminfo
 clean-aminfo:
-## Use '-rf', not just '-f', because the %*CLEAN% substitutions can also
-## contain any directory created by "makeinfo --html".
+## Use '-rf', not just '-f'; see comments in 'mostlyclean-aminfo'
+## above for details.
 ?TEXICLEAN?    -test -z "%TEXICLEAN%" \
 ?TEXICLEAN?    || rm -rf %TEXICLEAN%
 
@@ -322,8 +323,8 @@ maintainer-clean-aminfo:
          echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9]"; \
          rm -f $$i $$i-[0-9] $$i-[0-9][0-9]; \
        done
-## Use '-rf', not just '-f', because the %*CLEAN% substitutions can also
-## contain any directory created by "makeinfo --html".
+## Use '-rf', not just '-f'; see comments in 'mostlyclean-aminfo'
+## above for details.
 ?MAINTCLEAN?   -test -z "%MAINTCLEAN%" \
 ?MAINTCLEAN?   || rm -rf %MAINTCLEAN%
 
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 4c2135e..27b91a9 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -61,6 +61,7 @@ sc_tests_make_can_chain_suffix_rules \
 sc_tests_make_dont_do_useless_vpath_rebuilds \
 sc_no_dotmake_target \
 sc_no_am_makeflags \
+$(sc_obsolete_requirements_rules) \
 $(sc_renamed_variables_rules) \
 sc_no_RECHECK_LOGS \
 sc_tests_no_make_e \
@@ -76,7 +77,6 @@ sc_tests_plain_sleep \
 sc_m4_am_plain_egrep_fgrep \
 sc_tests_PATH_SEPARATOR \
 sc_tests_logs_duplicate_prefixes \
-sc_tests_makefile_variable_order \
 sc_perl_at_substs \
 sc_unquoted_DESTDIR \
 sc_tabs_in_texi \
@@ -397,6 +397,19 @@ sc_tests_obsolete_variables:
          exit 1; \
        else :; fi
 
+## Look out for obsolete requirements specified in the test cases.
+sc_obsolete_requirements_rules = sc_no_texi2dvi-o sc_no_makeinfo-html
+modern-requirement.texi2dvi-o = texi2dvi
+modern-requirement.makeinfo-html = makeinfo
+
+$(sc_obsolete_requirements_rules): sc_no_% :
+       @if grep -E 'required=.*\b$*\b' $(xtests); then \
+         echo "Requirement '$*' is obsolete and shouldn't" \
+              "be used anymore." >&2; \
+         echo "You should use '$(modern-requirement.$*)' instead." >&2; \
+         exit 1; \
+       fi
+
 ## Tests should never call some programs directly, but only through the
 ## corresponding variable (e.g., '$MAKE', not 'make').  This will allow
 ## the programs to be overridden at configure time (for less brittleness)
@@ -509,28 +522,6 @@ sc_tests_logs_duplicate_prefixes: 
sc_ensure_testsuite_has_run
          exit 1; \
        fi
 
-## Ensure variables are listed before rules in Makefile.in files we generate.
-sc_tests_makefile_variable_order: sc_ensure_testsuite_has_run
-       @st=0; \
-       for file in `find t -name Makefile.in -print`; do \
-         latevars=`sed -n \
-           -e :x -e 's/#.*//' \
-           -e '/\\\\$$/{' -e N -e 'b x' -e '}' \
-           -e '# Literal TAB.' \
-           -e '1,/^    /d' \
-           -e '# Allow @ so we match conditionals.' \
-           -e '/^ address@hidden,\} *=/p' $$file`; \
-         if test -n "$$latevars"; then \
-           echo "Variables are expanded too late in $$file:" >&2; \
-           echo "$$latevars" | sed 's/^/  /' >&2; \
-           st=1; \
-         fi; \
-       done; \
-       test $$st -eq 0 || { \
-         echo 'Ensure variables are expanded before rules' >&2; \
-         exit 1; \
-       }
-
 ## Using ':' as a PATH separator is not portable.
 sc_tests_PATH_SEPARATOR:
        @if grep -E '\bPATH=.*:.*' $(xtests) ; then \
diff --git a/t/instdir-texi.sh b/t/instdir-texi.sh
index 8909eab..b1da8d9 100755
--- a/t/instdir-texi.sh
+++ b/t/instdir-texi.sh
@@ -17,7 +17,7 @@
 # If $(infodir) is the empty string, then nothing should be installed there.
 # Likewise for the other install-* targets used for texinfo files.
 
-required='makeinfo-html tex texi2dvi'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 dvips --help \
diff --git a/t/silent-texi.sh b/t/silent-texi.sh
index 2bcbe70..0a6bb48 100755
--- a/t/silent-texi.sh
+++ b/t/silent-texi.sh
@@ -16,7 +16,7 @@
 
 # Check texinfo rules in silent-rules mode.
 
-required='makeinfo-html tex texi2dvi-o dvips'
+required='makeinfo tex texi2dvi dvips'
 . ./defs || Exit 1
 
 echo AC_OUTPUT >> configure.ac
diff --git a/t/txinfo-no-clutter.sh b/t/txinfo-no-clutter.sh
index ae5e9f2..43b83da 100755
--- a/t/txinfo-no-clutter.sh
+++ b/t/txinfo-no-clutter.sh
@@ -17,7 +17,7 @@
 # The pdf, ps and dvi targets shouldn't let clutter in the build directory.
 # Related to automake bug#11146.
 
-required='makeinfo tex texi2dvi-o dvips'
+required='makeinfo tex texi2dvi dvips'
 . ./defs || Exit 1
 
 mkdir sub
@@ -93,7 +93,8 @@ for fmt in info pdf ps dvi html all; do
   $MAKE $fmt
   ls -l . sub # For debugging.
   ls -d foo* baz* sub/bar* > lst
-  $EGREP -v '^(foo|sub/bar|baz)\.(texi|dvi|ps|pdf|html|info)$' lst && Exit 1
+  $EGREP -v '^(foo|sub/bar|baz)\.(texi|dvi|ps|pdf|html|info|t2[dp])$' \
+    lst && Exit 1
   $MAKE clean
 done
 
diff --git a/t/txinfo13.sh b/t/txinfo13.sh
index 77f9af7..d3a7079 100755
--- a/t/txinfo13.sh
+++ b/t/txinfo13.sh
@@ -18,7 +18,7 @@
 # Also make sure we do not distribute too much foo.info* files (Report
 # from Vincent Lefevre).
 
-required='makeinfo tex texi2dvi-o'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 echo AC_OUTPUT >> configure.ac
diff --git a/t/txinfo21.sh b/t/txinfo21.sh
index 258cba3..02ed6b1 100755
--- a/t/txinfo21.sh
+++ b/t/txinfo21.sh
@@ -17,7 +17,7 @@
 # Test support for building HTML documentation, and the many
 # install-DOC flavors.
 
-required='makeinfo-html tex texi2dvi'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 cat >>configure.ac <<\EOF
diff --git a/t/txinfo21b.sh b/t/txinfo21b.sh
index 3e053de..2860cde 100755
--- a/t/txinfo21b.sh
+++ b/t/txinfo21b.sh
@@ -18,10 +18,10 @@
 # install-DOC flavors, in VPATH builds.
 # Keep in sync with sister test 'txinfo21.sh'.
 # FIXME: in the long term, the best thing to do is probably to
-# FIXME: convert this test and the sister test 'txinfo21b.sh' to
+# FIXME: convert this test and the sister test 'txinfo21.sh' to
 # FIXME: TAP, and merge them.
 
-required='makeinfo-html tex texi2dvi'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 cat >>configure.ac <<\EOF
diff --git a/t/txinfo23.sh b/t/txinfo23.sh
index e5c1761..4ac9e9f 100755
--- a/t/txinfo23.sh
+++ b/t/txinfo23.sh
@@ -19,7 +19,7 @@
 # (Similar to txinfo13.test, plus DISTCLEANFILES).
 # (See also txinfo24.test and txinfo25.test).
 
-required='makeinfo tex texi2dvi-o'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'
diff --git a/t/txinfo24.sh b/t/txinfo24.sh
index 709cee7..ecf4e9c 100755
--- a/t/txinfo24.sh
+++ b/t/txinfo24.sh
@@ -18,7 +18,7 @@
 # (Similar to txinfo16.test, plus CLEANFILES).
 # (See also txinfo23.test and txinfo25.test).
 
-required='makeinfo tex texi2dvi-o'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'
diff --git a/t/txinfo25.sh b/t/txinfo25.sh
index 7aa66ae..0d217d5 100755
--- a/t/txinfo25.sh
+++ b/t/txinfo25.sh
@@ -20,7 +20,7 @@
 # (Similar to txinfo16.test, plus CLEANFILES).
 # (See also txinfo23.test and txinfo24.test).
 
-required='makeinfo tex texi2dvi-o'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'
diff --git a/t/txinfo28.sh b/t/txinfo28.sh
index 97b36d5..cd09f41 100755
--- a/t/txinfo28.sh
+++ b/t/txinfo28.sh
@@ -19,7 +19,7 @@
 # references.
 # Report from Ralf Corsepius.
 
-required='makeinfo tex texi2dvi-o'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 # This setting, when honored by GNU ls, used to cause an infinite loop
diff --git a/t/txinfo33.sh b/t/txinfo33.sh
index 4bdd767..d35d0d3 100755
--- a/t/txinfo33.sh
+++ b/t/txinfo33.sh
@@ -17,7 +17,7 @@
 # DVIS, PDFS, PSS, HTMLS should not be cleaned upon 'mostlyclean'.
 # Similar to txinfo25.test.
 
-required='makeinfo tex texi2dvi-o dvips'
+required='makeinfo tex texi2dvi dvips'
 . ./defs || Exit 1
 
 mkdir sub
diff --git a/t/vtexi4.sh b/t/vtexi4.sh
index 8023de2..33e7b07 100755
--- a/t/vtexi4.sh
+++ b/t/vtexi4.sh
@@ -21,7 +21,7 @@
 # for more vers*.texi files, and does not require makeinfo, tex and
 # texi2dvi.
 
-required='makeinfo tex texi2dvi-o'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 case `LC_ALL=C date '+%u'` in


hooks/post-receive
-- 
GNU Automake



reply via email to

[Prev in Thread] Current Thread [Next in Thread]