From 1512c09e30aa2d752ddd98ffc961e1fb8bb531c8 Mon Sep 17 00:00:00 2001
From: Dave Parker <dave.x.parker@gmail.com>
Date: Tue, 9 Apr 2013 10:40:23 +0000
Subject: [PATCH] Just look in both "include" and "Headers" for jni header
 files, regardless of OS, since may differ for Apple vs Oracle Java 7 on Macs.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6669 bbc10eb1-c90d-0410-af57-cb519fbb1720
---
 prism/Makefile | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/prism/Makefile b/prism/Makefile
index 479de2c8..ece2aaf5 100644
--- a/prism/Makefile
+++ b/prism/Makefile
@@ -171,7 +171,6 @@ ifeq ($(OSTYPE),linux)
 	LIBPREFIX = lib
 	LIBSUFFIX = .so
 	LIBMATH = -lm
-	OSTYPE_INCLUDE = include
 	CLASSPATHSEP = :
 endif
 # Solaris
@@ -188,7 +187,6 @@ ifeq ($(OSTYPE),solaris)
 	LIBPREFIX = lib
 	LIBSUFFIX = .so
 	LIBMATH = -lm
-	OSTYPE_INCLUDE = include
 	CLASSPATHSEP = :
 endif
 # Cygwin
@@ -207,7 +205,6 @@ ifeq ($(OSTYPE),cygwin)
 	LIBPREFIX =
 	LIBSUFFIX = .dll
 	LIBMATH = 
-	OSTYPE_INCLUDE = include
 	CLASSPATHSEP = ;
 	# Also override default compilers
 	# (because -mno-cygwin flag no longer in new versions of gcc)
@@ -237,7 +234,6 @@ ifeq ($(OSTYPE),darwin)
 	LIBPREFIX = lib
 	LIBSUFFIX = .dylib
 	LIBMATH = -lm
-	OSTYPE_INCLUDE = Headers
 	CLASSPATHSEP = :
 endif
 
@@ -262,8 +258,11 @@ INCLUDE_DIR =	include
 
 # Now we locate the JNI header files jni.h and jni_md.h
 # (in fact this is the only reason we need JAVA_DIR)
-JAVA_JNI_H_DIR = $(shell (ls "$(JAVA_DIR)"/$(OSTYPE_INCLUDE)/jni.h | sed 's/\/jni.h//') 2>/dev/null)
-JAVA_JNI_MD_H_DIR = $(shell (ls "$(JAVA_DIR)"/$(OSTYPE_INCLUDE)/jni_md.h "$(JAVA_DIR)"/$(OSTYPE_INCLUDE)/*/jni_md.h | sed 's/\/jni_md.h//') 2>/dev/null)
+JAVA_JNI_H_DIR = $(shell \
+	if [ -f "$(JAVA_DIR)"/include/jni.h ]; then echo "$(JAVA_DIR)"/include; \
+	elif [ -f "$(JAVA_DIR)"/Headers/jni.h ]; then echo "$(JAVA_DIR)"/Headers; \
+	else echo ""; fi )
+JAVA_JNI_MD_H_DIR = $(shell (ls "$(JAVA_JNI_H_DIR)"/jni_md.h "$(JAVA_JNI_H_DIR)"/*/jni_md.h | sed 's/\/jni_md.h//') 2>/dev/null)
 JAVA_INCLUDES = -I $(JAVA_JNI_H_DIR) -I $(JAVA_JNI_MD_H_DIR)
 
 #########################
@@ -565,13 +564,13 @@ checks:
 	  echo "Java directory \"$(JAVA_DIR)\" does not exist."; \
 	  exit 1; \
 	fi; \
-	if [ ! -f "$(JAVA_DIR)"/$(OSTYPE_INCLUDE)/jni.h ]; then \
-	  echo "Could not locate JNI header jni.h in \"$(JAVA_DIR)/$(OSTYPE_INCLUDE)\"."; \
+	if [ ! -f "$(JAVA_JNI_H_DIR)"/jni.h ]; then \
+	  echo "Could not locate JNI header jni.h within \"$(JAVA_DIR)\"."; \
 	  echo "You may need to set JAVA_DIR by hand. See the PRISM manual for details."; \
 	  exit 1; \
 	fi; \
-	if [ ! -f "$(JAVA_DIR)"/$(OSTYPE_INCLUDE)/jni_md.h -a ! -f "$(JAVA_DIR)"/$(OSTYPE_INCLUDE)/*/jni_md.h ]; then \
-	  echo "Could not locate JNI header jni_md.h in \"$(JAVA_DIR)/$(OSTYPE_INCLUDE)\" or ...."; \
+	if [ ! -f "$(JAVA_JNI_MD_H_DIR)"/jni_md.h ]; then \
+	  echo "Could not locate JNI header jni_md.h within \"$(JAVA_DIR)\"."; \
 	  echo "You may need to set JAVA_DIR by hand. See the PRISM manual for details."; \
 	  exit 1; \
 	fi; \