4 files changed, 6 insertions, 12 deletions
diff --git a/qtjava/designer/juic/bin/juic b/qtjava/designer/juic/bin/juic
index 8104ac9b..b01cadc7 100755
--- a/qtjava/designer/juic/bin/juic
+++ b/qtjava/designer/juic/bin/juic
@@ -14,13 +14,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 
-getAbsolutePath() {
-    ls=$(ls -l $1)
-    pushd `dirname ${ls##* }` >/dev/null
-    pwd -P
-    popd >/dev/null
-}
-
 usage() {
     juic=$(basename $0)
     cat <<EOT
@@ -43,8 +36,7 @@ EOT
 #              common/
 #              java
 
-a=$(getAbsolutePath $0)
-UIXSLDIR=$(dirname "$a")
+UIXSLDIR=/usr/share/juic
 UIXSL=${UIXSLDIR}/juic.xsl
 
 ABSTRACT="true"
diff --git a/qtjava/javalib/Makefile.am b/qtjava/javalib/Makefile.am
index aa90452e..ff360c62 100644
--- a/qtjava/javalib/Makefile.am
+++ b/qtjava/javalib/Makefile.am
@@ -1,5 +1,5 @@
 ####### kdevelop will overwrite this part!!! (begin)##########
-bin_PROGRAMS = javalib
+noinst_PROGRAMS = javalib
 
 ## INCLUDES were found outside kdevelop specific part
 
diff --git a/qtjava/javalib/org/kde/qt/Makefile.am b/qtjava/javalib/org/kde/qt/Makefile.am
index c05e600a..48a7978b 100644
--- a/qtjava/javalib/org/kde/qt/Makefile.am
+++ b/qtjava/javalib/org/kde/qt/Makefile.am
@@ -11,7 +11,7 @@ noinst_JAVA = $(EXTRA_DIST)
 #install-data-hook:	uninstall-javaJAVA
 
 JAVAROOT = ../../..
-CLASSPATH = $(srcdir)/../../..
+CLASSPATH = ../../..
 JAVACFLAGS = -classpath $(CLASSPATH)
 # Prevent stupid automake from putting JAVAC=javac in Makefile.in
 JAVAC = @JAVAC@
diff --git a/qtjava/javalib/qtjava/Makefile.am b/qtjava/javalib/qtjava/Makefile.am
index b1e12fa9..56279a41 100644
--- a/qtjava/javalib/qtjava/Makefile.am
+++ b/qtjava/javalib/qtjava/Makefile.am
@@ -1,5 +1,7 @@
 ####### kdevelop will overwrite this part!!! (begin)##########
-lib_LTLIBRARIES = libqtjava.la libqtjavasupport.la
+jniloc_LTLIBRARIES = libqtjava.la
+lib_LTLIBRARIES = libqtjavasupport.la
+jnilocdir = $(libdir)/jni
 
 
 ## INCLUDES were found outside kdevelop specific part