always-build-octave-jar

Gbp-Pq: Name always-build-octave-jar.patch

diff --git a/scripts/java/module.mk b/scripts/java/module.mk
index 6133cee67308e56daba0baf7ec98e3e4ac5a85b0..5c28330abf60b339e7514822baa49ef2d706af24 100644 (file)
--- a/scripts/java/module.mk
+++ b/scripts/java/module.mk
@@ -1,3 +1,6 @@
+JAVAC=javac
+JAR=jar
+
 FCN_FILE_DIRS += scripts/java
 
 %canon_reldir%_FCN_FILES = \
@@ -11,22 +14,18 @@ FCN_FILE_DIRS += scripts/java
   %reldir%/javarmpath.m \
   %reldir%/usejava.m
 
-if AMCOND_HAVE_JAVA
 %canon_reldir%_JAR_FILES = %reldir%/octave.jar
 
 JAR_FILES += $(%canon_reldir%_JAR_FILES)
-endif
 
 org_octave_dir = org/octave
 
-if AMCOND_HAVE_JAVA
 JAVA_SRC = \
   $(org_octave_dir)/ClassHelper.java \
   $(org_octave_dir)/Matrix.java \
   $(org_octave_dir)/OctClassLoader.java \
   $(org_octave_dir)/Octave.java \
   $(org_octave_dir)/OctaveReference.java
-endif
 
 JAVA_CLASSES = $(JAVA_SRC:.java=.class)
 
@@ -41,13 +40,11 @@ $(%canon_reldir%_JAVA_CLASSES) : %.class : %.java | %reldir%/$(octave_dirstamp)
                     -d $(abs_top_builddir)/scripts/java \
                     $(org_octave_dir)/$(<F) )
 
-if AMCOND_HAVE_JAVA
 %reldir%/octave.jar: $(%canon_reldir%_JAVA_CLASSES)
        $(AM_V_GEN)rm -f $@-t $@ && \
        ( cd scripts/java; \
          "$(JAR)" cf octave.jar-t $(JAVA_CLASSES) ) && \
        mv $@-t $@
-endif
 
 %canon_reldir%dir = $(fcnfiledir)/java