3 files changed, 7 insertions, 6 deletions
diff --git a/kdejava/koala/Makefile.am b/kdejava/koala/Makefile.am
index cb48a314..a0d75ae8 100644
--- a/kdejava/koala/Makefile.am
+++ b/kdejava/koala/Makefile.am
@@ -1,10 +1,10 @@
 ####### kdevelop will overwrite this part!!! (begin)##########
-bin_PROGRAMS = koala
+noinst_PROGRAMS = koala
 
 ## INCLUDES were found outside kdevelop specific part
 
 koala_SOURCES = main.cpp 
-koala_LDADD   = ./kdejava/libkdejava.la $(LIB_KSPELL) -lqtjava -lkparts $(LIB_KIO) -lXext -lX11 $(LIBSOCKET)
+koala_LDADD   = ./kdejava/libkdejava.la ../../qtjava/javalib/qtjava/libqtjava.la $(LIB_KSPELL) -lkparts $(LIB_KIO) -lXext -lX11 $(LIBSOCKET)
 
 SUBDIRS = org kdejava 
 
diff --git a/kdejava/koala/kdejava/Makefile.am b/kdejava/koala/kdejava/Makefile.am
index 2e90f46a..68f079c2 100644
--- a/kdejava/koala/kdejava/Makefile.am
+++ b/kdejava/koala/kdejava/Makefile.am
@@ -1,5 +1,6 @@
 ####### kdevelop will overwrite this part!!! (begin)##########
-lib_LTLIBRARIES = libkdejava.la
+jniloc_LTLIBRARIES = libkdejava.la
+jnilocdir = $(libdir)/jni
 
 
 ## INCLUDES were found outside kdevelop specific part
@@ -34,4 +35,4 @@ libkdejava_la_LDFLAGS = $(all_libraries) -no-undefined -version-info $(SOMAJOR):
 
 libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO)
 
-KDE_OPTIONS = qtonly
+KDE_OPTIONS = qtonly nofinal
diff --git a/kdejava/koala/org/kde/koala/Makefile.am b/kdejava/koala/org/kde/koala/Makefile.am
index 163870dc..bae2af61 100644
--- a/kdejava/koala/org/kde/koala/Makefile.am
+++ b/kdejava/koala/org/kde/koala/Makefile.am
@@ -11,7 +11,7 @@ noinst_JAVA = $(EXTRA_DIST)
 #install-data-hook:	uninstall-javaJAVA
 
 JAVAROOT = ../../..
-CLASSPATH = $(srcdir)/../../..:$(srcdir)/../../../../../qtjava/javalib/qtjava.jar:$(srcdir)
-JAVACFLAGS = -classpath $(CLASSPATH)
+CLASSPATH = ../../..:../../../../../qtjava/javalib/qtjava.jar:.
+JAVACFLAGS = -classpath $(CLASSPATH) -encoding iso-8859-1
 # Prevent stupid automake from putting JAVAC=javac in Makefile.in
 JAVAC = @JAVAC@