diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-01-11 02:07:51 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-01-11 02:07:51 +0100 |
| commit | 6f00e5383376ff8acf2a571a1a979a4e188fb9b9 (patch) | |
| tree | 61885bfebec7fd9567898549f60850bdce1603df /tests/txinfo22.test | |
| parent | 23b41dc75e1423480e5e40d4076dbd36ab7372ee (diff) | |
| parent | a115c7c75580f71dd6c123bb1cdaa07f742fd3a3 (diff) | |
| download | automake-6f00e5383376ff8acf2a571a1a979a4e188fb9b9.tar.gz | |
Merge branch 'maint'
Conflicts:
tests/instdir-texi.test
tests/txinfo22.test
Diffstat (limited to 'tests/txinfo22.test')
| -rwxr-xr-x | tests/txinfo22.test | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/tests/txinfo22.test b/tests/txinfo22.test index 4adf47379..731e37adc 100755 --- a/tests/txinfo22.test +++ b/tests/txinfo22.test @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2003, 2004, 2007, 2008, 2010 Free Software Foundation, -# Inc. +# Copyright (C) 2003, 2004, 2007, 2008, 2010, 2011 Free Software +# Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,32 +16,27 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Make sure the user can override TEXINFO_TEX. -# Report from Tom Tromey. -# Also make sure Automake ignores in-line comments when using variables, -# but preserve them in the output. # Also make sure TEXINFO_TEX is not distributed. +# Report from Tom Tromey. required='makeinfo tex texi2dvi' . ./defs || Exit 1 set -e -cat > configure.in << 'END' -AC_INIT([txinfo22], [1.0]) +cat > configure.in << END +AC_INIT([$me], [1.0]) AC_CONFIG_AUX_DIR([aux1]) AM_INIT_AUTOMAKE AC_CONFIG_FILES([Makefile]) AC_OUTPUT END -# Use a slash in the comment, because automake takes the dirname -# of TEXINFO_TEX to compute $(am__TEXINFO_TEX_DIR)... cat > Makefile.am << 'END' -TEXINFO_TEX = $(srcdir)/tex/texinfo.tex # some comment w/ a slash +TEXINFO_TEX = $(srcdir)/tex/texinfo.tex info_TEXINFOS = main.texi sure_it_exists: test -f $(TEXINFO_TEX) - test -d "$(am__TEXINFO_TEX_DIR)" sure_it_is_not_distributed: distdir test ! -f $(distdir)/tex/texinfo.tex END @@ -68,7 +63,9 @@ test ! -f aux1/texinfo.tex test -f tex/texinfo.tex ./configure + $MAKE sure_it_exists $MAKE distcheck -grep 'TEXINFO_TEX = .* # some comment w/ a slash' Makefile $MAKE sure_it_is_not_distributed + +: |