--- subversion-1.4.3/build/generator/gen_make.py.java +++ subversion-1.4.3/build/generator/gen_make.py @@ -277,7 +277,7 @@ '%s_CLASS_FILENAMES = %s\n' '%s_CLASSES = %s\n' '$(%s_HEADERS): $(%s_CLASS_FILENAMES)\n' - '\t%s -d %s -classpath %s:$(%s_CLASSPATH) $(%s_CLASSES)\n' + '\t%s -d %s -classpath %s $(%s_CLASSES)\n' % (targ_varname, string.join(header_class_filenames), targ_varname, string.join(header_classes), @@ -285,20 +285,20 @@ targ_varname, targ_varname, target_ob.link_cmd, target_ob.output_dir, target_ob.classes, - targ_varname, targ_varname)) + targ_varname)) # Build the objects from the object_srcs with one 'javac' call if object_srcs: self.ofile.write( '%s_SRC = %s\n' '$(%s_OBJECTS): $(%s_SRC)\n' - '\t%s -d %s -classpath %s:$(%s_CLASSPATH) $(%s_SRC)\n' + '\t%s -d %s -classpath %s $(%s_SRC)\n' % (targ_varname, string.join(object_srcs), targ_varname, targ_varname, target_ob.link_cmd, target_ob.output_dir, target_ob.classes, - targ_varname, targ_varname)) + targ_varname)) # Once the bytecodes have been compiled up, we produce the # JAR. --- subversion-1.4.3/build/ac-macros/java.m4.java +++ subversion-1.4.3/build/ac-macros/java.m4 @@ -82,7 +82,7 @@ if test "$os_arch" = "Darwin"; then AC_MSG_WARN([You may need to install the latest Java Development package from http://connect.apple.com/. Apple no longer includes the JNI header files by default on Java updates.]) fi - JDK_SUITABLE=no + JDK_SUITABLE=yes fi AC_MSG_RESULT([$JDK_SUITABLE]) --- subversion-1.4.3/Makefile.in.java +++ subversion-1.4.3/Makefile.in @@ -343,7 +343,7 @@ exit 1; \ fi @FIX_JAVAHL_LIB@ - $(JAVA) -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_tests_PATH):$(javahl_tests_CLASSPATH) org.tigris.subversion.javahl.tests.BasicTests + $(JAVA) -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_tests_PATH) org.tigris.subversion.javahl.tests.BasicTests # "make check CLEANUP=true" will clean up directories for successful tests. # "make check TESTS=subversion/tests/cmdline/basic_tests.py"