summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--altosui/Makefile.am2
-rw-r--r--configure.ac2
2 files changed, 2 insertions, 2 deletions
diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 9f75d5e3..04820294 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -6,7 +6,7 @@ man_MANS=altosui.1
altoslibdir=$(libdir)/altos
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:libaltos::$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar"
bin_SCRIPTS=altosui
diff --git a/configure.ac b/configure.ac
index 8ce94180..8b002662 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,7 @@ AC_SUBST(JVM_INCLUDE)
AC_ARG_WITH(android, AS_HELP_STRING([--with-android=PATH],
[Set android SDK path (default searches in a variety of places)]),
- [ANDROID_SDK=$withval], [ANDROID_SDK=auto])
+ [ANDROID_SDK=$withval], [ANDROID_SDK=${ANDROID_SDK:-auto}])
echo ANDROID_SDK set to $ANDROID_SDK