[med-svn] [ncbi-vdb] 03/05: Make sure jni.h will be really found

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch debian/jessie-backports
in repository ncbi-vdb.

commit a9e40caf57d2ad2e3e4e9d887461b07e924fa562
Author: Andreas Tille <tille at debian.org>
Date:   Wed Jun 7 14:10:59 2017 +0200

    Make sure jni.h will be really found
---
 debian/changelog | 1 +
 debian/rules     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ec3c99..1b09ade 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ncbi-vdb (2.8.1+dfsg-2~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.
+  * Make sure jni.h will be really found
 
  -- Andreas Tille <tille at debian.org>  Wed, 07 Jun 2017 13:57:51 +0200
 
diff --git a/debian/rules b/debian/rules
index 5ab8d57..b7b9715 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,8 +32,8 @@ override_dh_auto_configure:
 	# The build system shamelessly ignores those options like
 	#    --with-ngs-java-prefix=/usr/share/java
 	# so we need to go with patches.  The options are specified anyway.
-	ln -s /usr/lib/jvm/default-java/include/jni.h		libs/ngs-jni
-	ln -s /usr/lib/jvm/default-java/include/linux/jni_md.h	libs/ngs-jni
+	ln -s `ls /usr/lib/jvm/*/include/jni.h | head -n 1`		libs/ngs-jni
+	ln -s `ls /usr/lib/jvm/*/include/linux/jni_md.h | head -n 1`	libs/ngs-jni
 	./configure --build=$(MULTIARCH) --prefix=/usr --build-prefix=$(CURDIR)/debian/tmp/usr --with-ngs-sdk-prefix=/usr --with-debug --with-ngs-java-prefix=/usr/share/java
 	# no idea how to convince configure script to use the correct include dir so patching result afterwards
 	sed -i 's?HDF5_INCDIR = /usr/include?&/hdf5/serial?' build/Makefile.config*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ncbi-vdb.git