diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-08-18 21:53:34 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-08-18 21:53:34 +0200 |
| commit | 94aa58693d1a6fd09db715524e1785d062f1a252 (patch) | |
| tree | f1ffbde1c396ce0c1742b2dfd347db656704bbe3 /lib | |
| parent | c8b66be05a6301e5f82ee7b3b7a87727f5cecd9f (diff) | |
| parent | 8c4d0f0650486315359a63b2b6a832dcf4986147 (diff) | |
| download | automake-94aa58693d1a6fd09db715524e1785d062f1a252.tar.gz | |
Merge branch 'master' into test-protocols
* master:
* THANKS (Daniel Richard G.): Update e-mail address.
java: avoid compilation errors when CLASSPATH is empty
parallel-tests: no more spurious successes for FreeBSD make
hacking: we now require autoconf 2.68
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Automake/tests/Makefile.in | 2 | ||||
| -rw-r--r-- | lib/am/check.am | 9 | ||||
| -rw-r--r-- | lib/am/java.am | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index aca691c99..6c1599ee3 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -469,7 +469,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ echo "$$col$$br$$std"; \ fi; \ - $$success + $$success || exit 1 # Run all the tests. check-TESTS: diff --git a/lib/am/check.am b/lib/am/check.am index 27388df02..0628c8661 100644 --- a/lib/am/check.am +++ b/lib/am/check.am @@ -295,8 +295,13 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ echo "$$col$$br$$std"; \ fi; \ -## Be sure to exit with the proper exit status. - $$success +## Be sure to exit with the proper exit status. The use of "exit 1" below +## is required to work around a FreeBSD make bug (present only when running +## in concurrent mode). See automake bug#9245: +## <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9245> +## and FreeBSD PR bin/159730: +## <http://www.freebsd.org/cgi/query-pr.cgi?pr=159730>. + $$success || exit 1 RECHECK_LOGS = $(TEST_LOGS) diff --git a/lib/am/java.am b/lib/am/java.am index d6eb45585..604df2229 100644 --- a/lib/am/java.am +++ b/lib/am/java.am @@ -21,7 +21,7 @@ ## ---------- ## JAVAC = javac -CLASSPATH_ENV = CLASSPATH=$(JAVAROOT):$(srcdir)/$(JAVAROOT):$$CLASSPATH +CLASSPATH_ENV = CLASSPATH=$(JAVAROOT):$(srcdir)/$(JAVAROOT)$${CLASSPATH:+":$$CLASSPATH"} JAVAROOT = $(top_builddir) class%DIR%.stamp: $(%DIR%_JAVA) |