From 124fa87de6a80fea63ae9c88f43f69c5cc1417e7 Mon Sep 17 00:00:00 2001
From: Dave Parker <dave.x.parker@gmail.com>
Date: Wed, 30 Jul 2014 23:17:29 +0000
Subject: [PATCH] Amend Makefile to use -encoding UTF8 setting more widely for
 javac/javah/javadoc (based on reports from SIFT).

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

diff --git a/prism/Makefile b/prism/Makefile
index ab0f5526..e23be744 100644
--- a/prism/Makefile
+++ b/prism/Makefile
@@ -174,7 +174,7 @@ ifeq ($(OSTYPE),linux)
 	endif
 	endif
 	BIN_TARGETS=prism.linux xprism.linux
-	JFLAGS =
+	JFLAGS = -encoding UTF8
 	SHARED = -shared
 	#SHARED = -G
 	EXE =
@@ -191,7 +191,7 @@ ifeq ($(OSTYPE),solaris)
 	LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
 	BINDISTSUFFIX = solaris
 	BIN_TARGETS=prism.linux xprism.linux
-	JFLAGS =
+	JFLAGS = -encoding UTF8
 	SHARED = -shared -mimpure-text
 	EXE =
 	LIBPREFIX = lib
@@ -246,7 +246,7 @@ ifeq ($(OSTYPE),darwin)
 		BINDISTSUFFIX = osx32
 		BIN_TARGETS=prism.darwin32 xprism.linux
 	endif
-	JFLAGS =
+	JFLAGS = -encoding UTF8
 	SHARED = -dynamiclib
 	EXE =
 	LIBPREFIX = lib
@@ -360,7 +360,7 @@ make_dirs:
 	  LD="$(LD)" \
 	  JAVAC="$(JAVAC) $(JFLAGS)" \
 	  JAVACC="$(JAVACC)" \
-	  JAVAH="$(JAVAH)" \
+	  JAVAH="$(JAVAH) $(JFLAGS)" \
 	  CFLAGS="$(CFLAGS)" \
 	  CPPFLAGS="$(CPPFLAGS)" \
 	  LDFLAGS="$(LDFLAGS)" \
@@ -495,7 +495,7 @@ tarcf:
 PRISM_CLASSPATH = "$(THIS_DIR)/$(PRISM_DIR_REL)/$(CLASSES_DIR)$(CLASSPATHSEP)$(THIS_DIR)/$(PRISM_DIR_REL)/lib/*"
 
 javadoc:
-	@JAVADOC_DIRS=`echo $(MAKE_DIRS) | sed 's/\//./g' | sed 's/ /:/g'` && \mkdir -p javadoc; javadoc -d javadoc -overview $(SRC_DIR)/overview.html -sourcepath $(SRC_DIR) -classpath $(SRC_DIR)$(CLASSPATHSEP)$(PRISM_CLASSPATH) -subpackages $$JAVADOC_DIRS
+	@JAVADOC_DIRS=`echo $(MAKE_DIRS) | sed 's/\//./g' | sed 's/ /:/g'` && \mkdir -p javadoc; javadoc $(JFLAGS) -d javadoc -overview $(SRC_DIR)/overview.html -sourcepath $(SRC_DIR) -classpath $(SRC_DIR)$(CLASSPATHSEP)$(PRISM_CLASSPATH) -subpackages $$JAVADOC_DIRS
 
 clean: checks
 	@(for dir in $(MAKE_DIRS); do \