diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-09-18 23:32:38 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-09-18 23:45:22 +0200 |
| commit | c9dfc368a623178f32b67b164f051e9ab65edd99 (patch) | |
| tree | b9a5b06703ff51701fdb99a952eec11aa178030d /automake.in | |
| parent | dd7e620bf9ef468a762be8594c61c7e5bb0b0d27 (diff) | |
| download | automake-c9dfc368a623178f32b67b164f051e9ab65edd99.tar.gz | |
java: complain if java_JAVA is used but $(javadir) is undefined
Fixes automake bug#8461.
* automake.in (handle_java): Remove inappropriate "java" argument
from the calls to `&am_install_var' and `&am_primary_prefixes'.
* tests/instdir-java.test (Makefile.am): Define `$(javadir)'.
* tests/javadir-undefined.test: New test.
* tests/Makefile.am (TESTS): Add it.
* NEWS: Update.
Diffstat (limited to 'automake.in')
| -rwxr-xr-x | automake.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/automake.in b/automake.in index 208a66bf9..215881b14 100755 --- a/automake.in +++ b/automake.in @@ -5104,11 +5104,11 @@ sub handle_java { my @sourcelist = &am_install_var ('-candist', 'java', 'JAVA', - 'java', 'noinst', 'check'); + 'noinst', 'check'); return if ! @sourcelist; my @prefixes = am_primary_prefixes ('JAVA', 1, - 'java', 'noinst', 'check'); + 'noinst', 'check'); my $dir; my @java_sources = (); |