[med-svn] [libsbml] 01/01: Make sure we also set JAVA_INCLUDE_PATH the way as Kevin suggested

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libsbml.

commit 3e0b8b38c72058837a1595d91d6a26e72d40bc51
Author: Andreas Tille <tille at debian.org>
Date:   Thu Dec 17 16:59:12 2015 +0100

    Make sure we also set JAVA_INCLUDE_PATH the way as Kevin suggested
---
 debian/rules | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index d29b67d..8916f38 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,17 +20,17 @@ ifdef BIND_MATLAB
 CMAKE_OPTS := $(shell cat debian/cmake_opts)
 endif
 
+# seems we need to use debian/cmake_opts
+JDK_PATH:=$(shell readlink -f /usr/bin/javac | sed "s:/bin/javac::")
+JAVA_INCLUDE_PATH:=$(JDK_PATH)/include
+
 # This is the path to the javadoc jar, which doc/CMakeLists.txt doesn't find
-CMAKE_OPTS += -DJava_JAVADOC_JAR=/usr/lib/jvm/java-7-openjdk-amd64/lib/tools.jar
+CMAKE_OPTS += -DJava_JAVADOC_JAR=$(JDK_PATH)/lib/tools.jar -DJAVA_INCLUDE_PATH=$(JAVA_INCLUDE_PATH)
 
 ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel))
 CMAKE_OPTS += -D'WITH_01_COMPILE:BOOL=ON'
 endif
 
-# seems we need to use debian/cmake_opts
-export JDK_PATH=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::")
-export JAVA_INCLUDE_PATH=$(JDK_PATH)/include
-
 ### let's do it ###
 
 DEB_COMPRESS_EXCLUDE = .pdf

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