--- jacl1.4.1/jaclsh.in	2006-03-27 23:42:55.000000000 +0200
+++ jacl1.4.1/jaclsh.in-gil	2009-06-09 17:45:09.000000000 +0200
@@ -27,21 +27,21 @@
 
 # Directory where platform independent files live. This
 # includes the .jar files and any .tcl files
-XP_TCLJAVA_INSTALL_DIR=${prefix}/lib/tcljava${TCLJAVA_VERSION}
+XP_TCLJAVA_INSTALL_DIR=${prefix}/jacl
 
 # Add the .jar library files to the CLASSPATH
-JACL_CLASSPATH=@JAVA_CLASSPATH@:${XP_TCLJAVA_INSTALL_DIR}/tcljava.jar
-JACL_CLASSPATH=${JACL_CLASSPATH}:${XP_TCLJAVA_INSTALL_DIR}/jacl.jar
-JACL_CLASSPATH=${JACL_CLASSPATH}:${XP_TCLJAVA_INSTALL_DIR}/itcl.jar
-JACL_CLASSPATH=${JACL_CLASSPATH}:${XP_TCLJAVA_INSTALL_DIR}/tjc.jar
+JACL_CLASSPATH=/usr/lib/java/junit-3.8.2.jar:${XP_TCLJAVA_INSTALL_DIR}/tcljava-${TCLJAVA_VERSION}.jar
+JACL_CLASSPATH=${JACL_CLASSPATH}:${XP_TCLJAVA_INSTALL_DIR}/jacl-${TCLJAVA_VERSION}.jar
+JACL_CLASSPATH=${JACL_CLASSPATH}:${XP_TCLJAVA_INSTALL_DIR}/itcl-${TCLJAVA_VERSION}.jar
+JACL_CLASSPATH=${JACL_CLASSPATH}:${XP_TCLJAVA_INSTALL_DIR}/tjc-${TCLJAVA_VERSION}.jar
 
 # Debug CLASSPATH used when atteching a debugger to Jacl.
-JACL_DEBUG_CLASSPATH=${JACL_CLASSPATH}:${XP_TCLJAVA_INSTALL_DIR}/tcljavasrc.jar
-JACL_DEBUG_CLASSPATH=${JACL_DEBUG_CLASSPATH}:${XP_TCLJAVA_INSTALL_DIR}/jaclsrc.jar
-JACL_DEBUG_CLASSPATH=${JACL_DEBUG_CLASSPATH}:${XP_TCLJAVA_INSTALL_DIR}/itclsrc.jar
-JACL_DEBUG_CLASSPATH=${JACL_DEBUG_CLASSPATH}:${XP_TCLJAVA_INSTALL_DIR}/tjcsrc.jar
-JACL_DEBUG_CLASSPATH=${JACL_DEBUG_CLASSPATH}:${XP_TCLJAVA_INSTALL_DIR}/janino.jar
-JACL_DEBUG_CLASSPATH=${JACL_DEBUG_CLASSPATH}:${XP_TCLJAVA_INSTALL_DIR}/janinosrc.jar
+JACL_DEBUG_CLASSPATH=${JACL_CLASSPATH}:${XP_TCLJAVA_INSTALL_DIR}/tcljavasrc-${TCLJAVA_VERSION}.jar
+JACL_DEBUG_CLASSPATH=${JACL_DEBUG_CLASSPATH}:${XP_TCLJAVA_INSTALL_DIR}/jaclsrc-${TCLJAVA_VERSION}.jar
+JACL_DEBUG_CLASSPATH=${JACL_DEBUG_CLASSPATH}:${XP_TCLJAVA_INSTALL_DIR}/itclsrc-${TCLJAVA_VERSION}.jar
+JACL_DEBUG_CLASSPATH=${JACL_DEBUG_CLASSPATH}:${XP_TCLJAVA_INSTALL_DIR}/tjcsrc-${TCLJAVA_VERSION}.jar
+JACL_DEBUG_CLASSPATH=${JACL_DEBUG_CLASSPATH}:${XP_TCLJAVA_INSTALL_DIR}/janino-${TCLJAVA_VERSION}.jar
+JACL_DEBUG_CLASSPATH=${JACL_DEBUG_CLASSPATH}:${XP_TCLJAVA_INSTALL_DIR}/janinosrc-${TCLJAVA_VERSION}.jar
 
 # Fully qualified path name of JVM executable
 JAVA=@JAVA@