[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.13-7
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.13-780-g829c01d |
|
Date: |
Tue, 01 Jan 2013 00:54:49 +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=829c01d5385ee4d3af121d3d85bf27cc009ab5c7
The branch, ng/master has been updated
via 829c01d5385ee4d3af121d3d85bf27cc009ab5c7 (commit)
via e4a5f2bfc83ffee919c2c46311573f8cfa04c825 (commit)
via f87ce5b01869361bb9f1035ae9f45bbf5e76b8bc (commit)
via f2443786a7dec55f498c06b8b207751aa06368cf (commit)
via a1de656319377f01599d0002f0f4022bbd59b589 (commit)
via a2e9a71348a6ad79c9f856997b41daa36cca3f0b (commit)
via f3e8d1cd06707576cf702e11c758617bea1a067f (commit)
via ad416a86e74b809981bf3c70233bbbe4e4aa9113 (commit)
via 2d5ad971f6fed096afd26e19aabe223b5cf3c030 (commit)
via 9f34684b773490e03e2b93b37fb030c20afc5c0b (commit)
via 9c287816019d89c208c117c3d8a5017182e34e5a (commit)
via a9c8fc2f1d954d34f6f86b9cc74954f5ae5b8dc5 (commit)
via b434acca5bc93878530d5bf5c23eade77db00f09 (commit)
via 151f3708d25a66e817ba207eed723b53f4fbb19b (commit)
from 131d6b338738685fd824a5f6bfd545c63a810340 (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 829c01d5385ee4d3af121d3d85bf27cc009ab5c7
Merge: ad416a8 e4a5f2b
Author: Stefano Lattarini <address@hidden>
Date: Tue Jan 1 01:45:56 2013 +0100
Merge branch 'master' into ng/master
* master:
tests: don't always look for a C++ compiler named 'RCC'
tests: fix bug in pkg-config-macros.sh, could cause spurious SKIPs
docs: autom4te cache can break CONFIGURE_DEPENDENCIES
coverage: test CONFIGURE_DEPENDENCIES
coverage: test CONFIG_STATUS_DEPENDENCIES
Signed-off-by: Stefano Lattarini <address@hidden>
commit ad416a86e74b809981bf3c70233bbbe4e4aa9113
Merge: b434acc 2d5ad97
Author: Stefano Lattarini <address@hidden>
Date: Mon Dec 31 23:01:52 2012 +0100
Merge branch 'master' into ng/master
* master:
tests: fix reference to related tests in some comments
tests: some enhancements to texinfo tests (from Automake-NG)
tests: fix reference to sister tests in two heading comments
Signed-off-by: Stefano Lattarini <address@hidden>
commit b434acca5bc93878530d5bf5c23eade77db00f09
Author: Stefano Lattarini <address@hidden>
Date: Mon Dec 31 19:04:02 2012 +0100
tests: improve sync between to sister tests
* t/txinfo-many-output-formats.sh: This ...
* t/txinfo-many-output-formats-vpath.sh: ... and this.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 151f3708d25a66e817ba207eed723b53f4fbb19b
Author: Stefano Lattarini <address@hidden>
Date: Mon Dec 31 18:42:32 2012 +0100
tests: better name for a texinfo test
* t/txinfo21b: Rename ...
* t/txinfo-many-output-formats-vpath.sh: ... like this. This matches
the similar rename "txinfo21" -> "txinfo-many-output-formats" done
for sister test 't/txinfo21.sh' in the master branch (rename that has
already been merged in the 'ng/master' branch.
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
THANKS | 1 +
configure.ac | 10 ++-
doc/automake-ng.texi | 8 ++-
t/acloca10.sh | 4 +-
t/color-tests.sh | 2 +-
t/color-tests2.sh | 2 +-
t/pkg-config-macros.sh | 5 +-
t/remake-config-status-dependencies.sh | 70 +++++++++++++++
t/remake-configure-dependencies.sh | 80 +++++++++++++++++
t/remake-deleted-m4-file.sh | 4 +-
...o21b.sh => txinfo-many-output-formats-vpath.sh} | 94 ++++++++++++-------
t/txinfo-many-output-formats.sh | 35 ++++---
12 files changed, 252 insertions(+), 63 deletions(-)
create mode 100755 t/remake-config-status-dependencies.sh
create mode 100755 t/remake-configure-dependencies.sh
rename t/{txinfo21b.sh => txinfo-many-output-formats-vpath.sh} (66%)
diff --git a/THANKS b/THANKS
index 1ff7c08..5fa307d 100644
--- a/THANKS
+++ b/THANKS
@@ -337,6 +337,7 @@ Robert Collins address@hidden
Robert Swafford address@hidden
Roberto Bagnara address@hidden
Roman Fietze address@hidden
+Ronald Copley address@hidden
Ronald Landheer address@hidden
Roumen Petrov address@hidden
Russ Allbery address@hidden
diff --git a/configure.ac b/configure.ac
index fe10a17..4fbbf82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -439,12 +439,14 @@ AS_IF([test x"$GCC" = x"yes"], [am_CC_is_GNU=yes],
[am_CC_is_GNU=no])
# On case-insensitive file systems (seen e.g. on Cygwin and Mac OS X)
# we must avoid looking for 'CC', because that would be the same as
# 'cc', and could cause $CXX to point to the C compiler, instead of
-# to a C++ compiler as expected. See automake bugs #11893 and #10766.
+# to a C++ compiler as expected (see automake bugs #11893 and #10766).
+# Similarly, we must avoid looking for 'RCC', as that can point to the
+# Qt4 "Resource Compiler": <http://doc.qt.digia.com/4.2/rcc.html>
if test -f /bIn/rMdIr || test -f /uSr/bIn/rMdIr; then
# Case-insensitive file system, don't look for CC.
- am_CC=
+ am_CC= am_RCC=
else
- am_CC=CC
+ am_CC=CC am_RCC=RCC
fi
# The list of C++ compilers here has been copied, pasted and edited
@@ -452,7 +454,7 @@ fi
# Keep it in sync, or better again, find out a way to avoid this code
# duplication.
_AM_COMPILER_CAN_FAIL([AC_PROG_CXX(dnl
- [aCC $am_CC FCC KCC RCC xlC_r xlC c++ cxx cc++ gpp g++])],
+ [aCC $am_CC FCC KCC $am_RCC xlC_r xlC c++ cxx cc++ gpp g++])],
[CXX=false; _AM_SKIP_COMP_TESTS([C++])])
AS_IF([test x"$GXX" = x"yes"], [am_CXX_is_GNU=yes], [am_CXX_is_GNU=no])
diff --git a/doc/automake-ng.texi b/doc/automake-ng.texi
index 0cc8192..cdb1565 100644
--- a/doc/automake-ng.texi
+++ b/doc/automake-ng.texi
@@ -9797,6 +9797,7 @@ from @file{configure.ac}. For instance, the following
statement will
cause @file{configure} to be rerun each time @file{version.sh} is
changed.
address@hidden Keep in sync with remake-config-status-dependencies.sh
@example
AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/version.sh'])
@end example
@@ -9809,12 +9810,17 @@ any level in the build hierarchy.
Beware not to mistake @code{CONFIGURE_DEPENDENCIES} for
@code{CONFIG_STATUS_DEPENDENCIES}.
address@hidden Keep in sync with remake-configure-dependencies.sh
@code{CONFIGURE_DEPENDENCIES} adds dependencies to the
@file{configure} rule, whose effect is to run @command{autoconf}. This
variable should be seldom used, because @command{automake} already tracks
@code{m4_include}d files. However it can be useful when playing
tricky games with @code{m4_esyscmd} or similar non-recommendable
-macros with side effects.
+macros with side effects. Be also aware that interactions of this
+variable with the @ref{Autom4te Cache, , autom4te cache, autoconf,
+The Autoconf Manual} are quite problematic and can cause subtle
+breakage, so you might want to disable the cache if you want to use
address@hidden
@code{CONFIG_STATUS_DEPENDENCIES} adds dependencies to the
@file{config.status} rule, whose effect is to run @file{configure}.
diff --git a/t/acloca10.sh b/t/acloca10.sh
index f10abcd..632e816 100755
--- a/t/acloca10.sh
+++ b/t/acloca10.sh
@@ -15,8 +15,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Make sure aclocal define macros in the same order as -I's.
-# This is the same as aclocal9.sh, with the macro calls reversed.
-# (It did make a difference.)
+# This is the same as aclocal-I-order-1.sh, with the macro calls
+# reversed (it did make a difference).
#
# Also check for --install.
diff --git a/t/color-tests.sh b/t/color-tests.sh
index 6817af6..a6c2371 100755
--- a/t/color-tests.sh
+++ b/t/color-tests.sh
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test Automake TESTS color output, by forcing it.
-# Keep this in sync with the sister test 'color2.sh'.
+# Keep this in sync with the sister test 'color-tests2.sh'.
required='grep-nonprint'
# For gen-testsuite-part: ==> try-with-serial-tests <==
diff --git a/t/color-tests2.sh b/t/color-tests2.sh
index 3efcab8..4f136e7 100755
--- a/t/color-tests2.sh
+++ b/t/color-tests2.sh
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test Automake TESTS color output, using the expect(1) program.
-# Keep this in sync with the sister test 'color.sh'.
+# Keep this in sync with the sister test 'color-tests.sh'.
required='grep-nonprint'
# For gen-testsuite-part: ==> try-with-serial-tests <==
diff --git a/t/pkg-config-macros.sh b/t/pkg-config-macros.sh
index ec8b381..5069c08 100755
--- a/t/pkg-config-macros.sh
+++ b/t/pkg-config-macros.sh
@@ -48,9 +48,10 @@ XT_ACLOCAL_PATH=/usr/local/share/aclocal:/usr/share/aclocal
# Find the location of the pkg-config executable.
oIFS=$IFS dir=
+IFS=:
for d in $PATH; do
IFS=$oIFS
- if test -f $dir/pkg-config || test -f $dir/pkg-config.exe; then
+ if test -f $d/pkg-config || test -f $d/pkg-config.exe; then
dir=$d
break
fi
@@ -61,7 +62,7 @@ IFS=$oIFS
# where the corresponding pkg.m4 might be installed.
if test -n "$dir"; then
# Only support standard installation layouts.
- XT_ACLOCAL_PATH=${dir%/bin}/share/alocal:$XT_ACLOCAL_PATH
+ XT_ACLOCAL_PATH=${dir%/bin}/share/aclocal:$XT_ACLOCAL_PATH
fi
XT_ACLOCAL_PATH=$XT_ACLOCAL_PATH${ACLOCAL_PATH+":$ACLOCAL_PATH"}
diff --git a/t/remake-config-status-dependencies.sh
b/t/remake-config-status-dependencies.sh
new file mode 100755
index 0000000..c625661
--- /dev/null
+++ b/t/remake-config-status-dependencies.sh
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 2013 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test CONFIG_STATUS_DEPENDENCIES.
+
+. test-init.sh
+
+cat >> configure.ac <<'END'
+. ${srcdir}/version.sh
+AC_SUBST([EXTRA_VERSION])
+AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/version.sh'])
+AC_OUTPUT
+END
+
+echo EXTRA_VERSION=1.0 > version.sh
+
+cat > Makefile.am <<'END'
+.PHONY: test-1 test-2 test-3
+check-local: test-3
+test-1:
+ test $(EXTRA_VERSION) = 1.0
+test-2:
+ test $(EXTRA_VERSION) = 2.1
+test-3:
+ test $(EXTRA_VERSION) = 3.14
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE test-1
+
+$sleep
+echo EXTRA_VERSION=2.1 > version.sh
+using_gmake || $MAKE Makefile
+$MAKE test-2
+
+$MAKE distclean
+mkdir build
+cd build
+../configure
+$MAKE test-2
+$sleep
+echo EXTRA_VERSION=3.14 > ../version.sh
+using_gmake || $MAKE Makefile
+$MAKE test-3
+
+# Contents of $(CONFIG_STATUS_DEPENDENCIES) are *not* to be
+# automatically distributed; there is no generic good reason
+# for that.
+$MAKE distdir
+test ! -e $distdir/version.sh
+test -f $distdir/configure || exit 99 # Sanity check.
+
+:
diff --git a/t/remake-configure-dependencies.sh
b/t/remake-configure-dependencies.sh
new file mode 100755
index 0000000..2e5df88
--- /dev/null
+++ b/t/remake-configure-dependencies.sh
@@ -0,0 +1,80 @@
+#! /bin/sh
+# Copyright (C) 2013 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test CONFIGURE_DEPENDENCIES.
+
+. test-init.sh
+
+cat > configure.ac <<'END'
+AC_INIT([confdeps], m4_esyscmd([./print-version]))
+AM_INIT_AUTOMAKE([foreign])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+# Needless to say, the autom4te cache happily break this test.
+cat > .autom4te.cfg <<'END'
+begin-language: "Autoconf-without-aclocal-m4"
+args: --no-cache
+end-language: "Autoconf-without-aclocal-m4"
+END
+
+cat > Makefile.am <<'END'
+EXTRA_DIST = .autom4te.cfg
+CONFIGURE_DEPENDENCIES = $(top_srcdir)/print-version
+
+test-1:
+ test $(VERSION) = 1.0
+test-2:
+ test $(VERSION) = 2.1
+test-3:
+ test $(VERSION) = 3.14
+
+.PHONY: test-1 test-2 test-3
+
+# Contents of $(CONFIGURE_DEPENDENCIES) are to be automatically
+# distributed.
+local-check: test-3 distdir
+ test -f $(distdir)/print-version
+END
+
+(echo '#!/bin/sh' && echo 'printf %s 1.0') > print-version
+chmod a+x print-version
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE test-1
+
+(echo '#!/bin/sh' && echo 'printf %s 2.1') > print-version
+using_gmake || $MAKE Makefile
+$MAKE test-2
+
+$MAKE distclean
+mkdir build
+cd build
+../configure
+$MAKE test-2
+(echo '#!/bin/sh' && echo 'printf %s 3.14') > ../print-version
+using_gmake || $MAKE Makefile
+$MAKE test-3
+
+# Check that $(CONFIGURE_DEPENDENCIES) are automatically distributed.
+$MAKE distcheck
+
+:
diff --git a/t/remake-deleted-m4-file.sh b/t/remake-deleted-m4-file.sh
index 59b18ae..cb23417 100755
--- a/t/remake-deleted-m4-file.sh
+++ b/t/remake-deleted-m4-file.sh
@@ -17,8 +17,8 @@
# Test remake rules when an m4 file gets removed and the macros it
# defined get inlined into the caller. Try with both an indirect
# call and a direct one. This can be seen as testing the "deleted
-# header file" issue w.r.t. aclocal.m4 dependencies. See also related
-# test 'acloca22.sh'.
+# header file" issue w.r.t. aclocal.m4 dependencies. See also
+# related test 'aclocal-deleted-header.sh'.
. test-init.sh
diff --git a/t/txinfo21b.sh b/t/txinfo-many-output-formats-vpath.sh
similarity index 66%
rename from t/txinfo21b.sh
rename to t/txinfo-many-output-formats-vpath.sh
index bb925f2..d633589 100755
--- a/t/txinfo21b.sh
+++ b/t/txinfo-many-output-formats-vpath.sh
@@ -16,10 +16,9 @@
# Test support for building HTML documentation, and the many
# 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 'txinfo21.sh' to
-# FIXME: TAP, and merge them.
+# Keep in sync with sister test 'txinfo-many-output-formats.sh'.
+# FIXME: in the long term, the best thing to do is probably to convert
+# FIXME: this test and that sister test to TAP, and merge them.
required='makeinfo tex texi2dvi'
. test-init.sh
@@ -76,18 +75,26 @@ info_TEXINFOS = main3.texi
install-pdf-local:
@$(MKDIR_P) "$(pdfdir)"
- :> "$(pdfdir)/hello"
+ : > "$(pdfdir)/hello"
uninstall-local:
rm -f "$(pdfdir)/hello"
+
+check-local: ps pdf dvi html # For "make distcheck".
END
$ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
-mkdir build
-cd build
-../configure
+# To simplify syncing with sister test 'txinfo-many-output-formats.sh'
+srcdir=..
+
+if test $srcdir = ..; then
+ mkdir build
+ cd build
+fi
+
+$srcdir/configure --prefix="$(pwd)"
$MAKE
@@ -99,16 +106,16 @@ test -d sub/main2.html
test -d rec/main3.html
# Rebuilding main.html should cause its timestamp to be updated.
-is_newest main.html ../main.texi
+is_newest main.html $srcdir/main.texi
$sleep
-touch ../main.texi
+touch $srcdir/main.texi
$MAKE html
-is_newest main.html ../main.texi
+is_newest main.html $srcdir/main.texi
$MAKE clean
-test ! -d main.html
-test ! -d sub/main2.html
-test ! -d rec/main3.html
+test ! -e main.html
+test ! -e sub/main2.html
+test ! -e rec/main3.html
# Test production of a single HTML file.
$MAKE MAKEINFOFLAGS=--no-split html
@@ -116,42 +123,55 @@ test -f main.html
test -f sub/main2.html
test -f rec/main3.html
$MAKE clean
-test ! -f main.html
-test ! -f sub/main2.html
-test ! -f rec/main3.html
+test ! -e main.html
+test ! -e sub/main2.html
+test ! -e rec/main3.html
# Make sure AM_MAKEINFOHTMLFLAGS is supported, and override AM_MAKEINFO.
-cat >> ../Makefile.am <<\EOF
+
+cp $srcdir/Makefile.am $srcdir/Makefile.sav
+cat >> $srcdir/Makefile.am <<'EOF'
AM_MAKEINFOHTMLFLAGS = --no-headers --no-split
AM_MAKEINFOFLAGS = --unsupported-option
EOF
-../configure --prefix "$(pwd)"
+(cd $srcdir && $AUTOMAKE)
+./config.status Makefile
+
$MAKE html
test -f main.html
test -f sub/main2.html
test -d rec/main3.html
$MAKE clean
-test ! -f main.html
-test ! -f sub/main2.html
-test ! -d rec/main3.html
+test ! -e main.html
+test ! -e sub/main2.html
+test ! -e rec/main3.html
$MAKE install-html
test -f share/$me/html/main.html
test -f share/$me/html/main2.html
test -d share/$me/html/main3.html
$MAKE uninstall
-test ! -f share/$me/html/main.html
-test ! -f share/$me/html/main2.html
-test ! -d share/$me/html/main3.html
+test ! -e share/$me/html/main.html
+test ! -e share/$me/html/main2.html
+test ! -e share/$me/html/main3.html
+
+$MAKE dvi
+test -f main.dvi
+test -f sub/main2.dvi
+test -f rec/main3.dvi
+$MAKE clean
+test ! -e main.dvi
+test ! -e sub/main2.dvi
+test ! -e rec/main3.dvi
$MAKE install-dvi
test -f share/$me/dvi/main.dvi
test -f share/$me/dvi/main2.dvi
test -f share/$me/dvi/main3.dvi
$MAKE uninstall
-test ! -f share/$me/dvi/main.dvi
-test ! -f share/$me/dvi/main2.dvi
-test ! -f share/$me/dvi/main3.dvi
+test ! -e share/$me/dvi/main.dvi
+test ! -e share/$me/dvi/main2.dvi
+test ! -e share/$me/dvi/main3.dvi
dvips --help || skip_ "dvips is missing"
@@ -160,9 +180,9 @@ test -f share/$me/ps/main.ps
test -f share/$me/ps/main2.ps
test -f share/$me/ps/main3.ps
$MAKE uninstall
-test ! -f share/$me/ps/main.ps
-test ! -f share/$me/ps/main2.ps
-test ! -f share/$me/ps/main3.ps
+test ! -e share/$me/ps/main.ps
+test ! -e share/$me/ps/main2.ps
+test ! -e share/$me/ps/main3.ps
pdfetex --help || pdftex --help \
|| skip_ "pdftex and pdfetex are both missing"
@@ -173,9 +193,13 @@ test -f share/$me/pdf/main2.pdf
test -f share/$me/pdf/main3.pdf
test -f share/$me/pdf/hello
$MAKE uninstall
-test ! -f share/$me/pdf/main.pdf
-test ! -f share/$me/pdf/main2.pdf
-test ! -f share/$me/pdf/main3.pdf
-test ! -f share/$me/pdf/hello
+test ! -e share/$me/pdf/main.pdf
+test ! -e share/$me/pdf/main2.pdf
+test ! -e share/$me/pdf/main3.pdf
+test ! -e share/$me/pdf/hello
+
+# Restore the makefile without a broken AM_MAKEINFOFLAGS definition.
+cp -f $srcdir/Makefile.sav $srcdir/Makefile.am
+$MAKE distcheck
:
diff --git a/t/txinfo-many-output-formats.sh b/t/txinfo-many-output-formats.sh
index 69e9c48..82ab8e9 100755
--- a/t/txinfo-many-output-formats.sh
+++ b/t/txinfo-many-output-formats.sh
@@ -16,6 +16,9 @@
# Test support for building HTML documentation, and the many
# install-DOC flavors.
+# Keep in sync with sister test 'txinfo-many-output-formats-vpath.sh'.
+# FIXME: in the long term, the best thing to do is probably to convert
+# FIXME: this test and that sister test to TAP, and merge them.
required='makeinfo tex texi2dvi'
. test-init.sh
@@ -34,7 +37,6 @@ AC_OUTPUT
EOF
cat > Makefile.am << 'END'
-check-local: ps pdf dvi html # For "make distcheck".
SUBDIRS = rec
info_TEXINFOS = main.texi sub/main2.texi
END
@@ -73,7 +75,7 @@ info_TEXINFOS = main3.texi
install-pdf-local:
@$(MKDIR_P) "$(pdfdir)"
- :> "$(pdfdir)/hello"
+ : > "$(pdfdir)/hello"
uninstall-local:
rm -f "$(pdfdir)/hello"
@@ -84,7 +86,15 @@ $ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
-./configure --prefix "$(pwd)"
+# To simplify syncing with sister test 'txinfo-many-output-formats.sh'
+srcdir=.
+
+if test $srcdir = ..; then
+ mkdir build
+ cd build
+fi
+
+$srcdir/configure --prefix="$(pwd)"
$MAKE
@@ -96,11 +106,11 @@ test -d sub/main2.html
test -d rec/main3.html
# Rebuilding main.html should cause its timestamp to be updated.
-is_newest main.html main.texi
+is_newest main.html $srcdir/main.texi
$sleep
-touch main.texi
+touch $srcdir/main.texi
$MAKE html
-is_newest main.html main.texi
+is_newest main.html $srcdir/main.texi
$MAKE clean
test ! -e main.html
@@ -119,19 +129,18 @@ test ! -e rec/main3.html
# Make sure AM_MAKEINFOHTMLFLAGS is supported, and override AM_MAKEINFO.
-cp Makefile.am Makefile.sav
-cat >>Makefile.am <<\EOF
+cp $srcdir/Makefile.am $srcdir/Makefile.sav
+cat >> $srcdir/Makefile.am <<'EOF'
AM_MAKEINFOHTMLFLAGS = --no-headers --no-split
AM_MAKEINFOFLAGS = --unsupported-option
EOF
-$AUTOMAKE
+(cd $srcdir && $AUTOMAKE)
./config.status Makefile
$MAKE html
test -f main.html
test -f sub/main2.html
test -d rec/main3.html
-
$MAKE clean
test ! -e main.html
test ! -e sub/main2.html
@@ -150,7 +159,6 @@ $MAKE dvi
test -f main.dvi
test -f sub/main2.dvi
test -f rec/main3.dvi
-
$MAKE clean
test ! -e main.dvi
test ! -e sub/main2.dvi
@@ -191,10 +199,7 @@ test ! -e share/$me/pdf/main3.pdf
test ! -e share/$me/pdf/hello
# Restore the makefile without a broken AM_MAKEINFOFLAGS definition.
-mv -f Makefile.sav Makefile.am
-$AUTOMAKE
-./config.status Makefile
-
+cp -f $srcdir/Makefile.sav $srcdir/Makefile.am
$MAKE distcheck
:
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.13-780-g829c01d,
Stefano Lattarini <=