- attempt four at fixing javahl
This commit is contained in:
parent
1c7617c6ba
commit
79703ad872
@ -9,7 +9,7 @@
|
|||||||
% (targ_varname, string.join(header_class_filenames),
|
% (targ_varname, string.join(header_class_filenames),
|
||||||
|
|
||||||
targ_varname, string.join(header_classes),
|
targ_varname, string.join(header_classes),
|
||||||
@@ -285,7 +285,7 @@
|
@@ -285,20 +285,20 @@
|
||||||
targ_varname, targ_varname,
|
targ_varname, targ_varname,
|
||||||
|
|
||||||
target_ob.link_cmd, target_ob.output_dir, target_ob.classes,
|
target_ob.link_cmd, target_ob.output_dir, target_ob.classes,
|
||||||
@ -18,6 +18,21 @@
|
|||||||
|
|
||||||
# Build the objects from the object_srcs with one 'javac' call
|
# Build the objects from the object_srcs with one 'javac' call
|
||||||
if object_srcs:
|
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.java
|
||||||
+++ subversion-1.4.3/build/ac-macros/java.m4
|
+++ subversion-1.4.3/build/ac-macros/java.m4
|
||||||
@@ -82,7 +82,7 @@
|
@@ -82,7 +82,7 @@
|
||||||
|
Loading…
Reference in New Issue
Block a user