summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2008-06-11 21:35:27 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2008-06-11 21:35:27 +0000
commit22ba954fea1508b780f566481960afce7e129e1d (patch)
tree7019b179871a652053b33079dc8c58073782f8b3
parent7eb55f2738c779fb51d01ec580cee7e4b688f759 (diff)
downloadclasspath-22ba954fea1508b780f566481960afce7e129e1d.tar.gz
Forwardport native-only build fix #03.
2008-06-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * scripts/check_jni_methods.sh.in: Search the source directory as well for when headers are in the tarball.
-rw-r--r--ChangeLog6
-rw-r--r--scripts/check_jni_methods.sh.in2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 91aad3025..bb4e6a3a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-06-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
+ * scripts/check_jni_methods.sh.in:
+ Search the source directory as well for
+ when headers are in the tarball.
+
+2008-06-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
* Makefile.am: Replace tools with
$(TOOLSDIR).
* m4/acinclude.m4: Include option
diff --git a/scripts/check_jni_methods.sh.in b/scripts/check_jni_methods.sh.in
index 73cd1fc6a..835f7b4b1 100644
--- a/scripts/check_jni_methods.sh.in
+++ b/scripts/check_jni_methods.sh.in
@@ -9,7 +9,7 @@ TMPFILE3=/tmp/check-jni-methods.$$.3
# Find all methods defined in the header files generated
# from the java source files.
-grep -h '^JNIEXPORT .* Java_' @abs_top_builddir@/include/*.h | \
+grep -h '^JNIEXPORT .* Java_' @abs_top_builddir@/include/*.h @abs_top_srcdir@/include/*.h | \
LC_ALL=C sed -e 's,.*JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' | \
sort > $TMPFILE