Merge remote branch 'keithp/macos'

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index cd1230238a1cd199fb3e2a5156248cf67ead5e9f..0613a494d82a8b7915142f85006e344ddb55bce1 100644 (file)
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -38,7 +38,7 @@ all: altosui.jar
 $(CLASSFILES):
 
 .java.class:
-       javac -cp "$(CLASSPATH)" $(JAVAFLAGS) $*.java
+       javac -encoding UTF8 -classpath "$(CLASSPATH)" $(JAVAFLAGS) $*.java
 
 altosui.jar: classes/altosui classes/libaltosJNI $(FREETTSJAR) $(CLASSFILES) Manifest.txt
        cd ./classes && jar cfm ../$@ altosui/Manifest.txt altosui/*.class libaltosJNI/*.class