--- bin/henplus	2004-03-04 14:53:28.012345678 +0100
+++ bin/henplus	2004-06-25 21:13:26.000000000 +0200
@@ -14,19 +14,13 @@
 fi
 
 ##------------------
-THISDIR=`dirname $0`
-HENPLUSDIR=$THISDIR/../share/henplus
-
-# not yet installed ? Then look in the build directory
-if [ ! -d "$HENPLUSDIR" ] ; then
-	HENPLUSDIR=$THISDIR/../build
-fi
+HENPLUSDIR=$(dirname $(java-config -p henplus))
 
 # location of the readline lib.
 # Modify this, if you installation stores this at a different
 # position.
-LD_LIBRARY_PATH=$THISDIR/../lib:/usr/lib/jni:$LD_LIBRARY_PATH
-CLASSPATH=$CLASSPATH:$THISDIR/../share/java/libreadline-java.jar
+LD_LIBRARY_PATH=$(dirname $0)/../lib:$LD_LIBRARY_PATH
+CLASSPATH=$CLASSPATH:$(java-config -p libreadline-java)
 
 # you may just throw your own jar files in this dir.
 # (like additional JDBC-drivers, that are not in default
@@ -66,6 +60,6 @@
     fi
 done
 
-export CLASSPATH LD_LIBRARY_PATH
+export LD_LIBRARY_PATH
 
-exec $JAVA $JAVA_FLAGS henplus.HenPlus "$@"
+exec $JAVA -cp $CLASSPATH $JAVA_FLAGS henplus.HenPlus "$@"