From c43b3e390ac4cf97970ffcce48fbeb19345b4e89 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Thu, 24 Oct 2013 07:41:28 +0000 Subject: [PATCH] Makefile fix for when there are two occurrences of jni_md.h (reported/fixed by Gaston Ingaramo). git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7521 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prism/Makefile b/prism/Makefile index 7d0a955e..42ac295c 100644 --- a/prism/Makefile +++ b/prism/Makefile @@ -262,7 +262,7 @@ 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_JNI_MD_H_DIR = $(shell (ls "$(JAVA_JNI_H_DIR)"/jni_md.h "$(JAVA_JNI_H_DIR)"/*/jni_md.h | head -n 1 | sed 's/\/jni_md.h//') 2>/dev/null) JAVA_INCLUDES = -I $(JAVA_JNI_H_DIR) -I $(JAVA_JNI_MD_H_DIR) #########################