From: Debian Octave Group <team+pkg-octave-team@tracker.debian.org>
Date: Tue, 1 Oct 2019 19:34:08 +0000 (+0100)
Subject: always-build-octave-jar
X-Git-Tag: archive/raspbian/5.1.0-4+rpi1~1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2a574e3b0f7bab65afe8aa68dddfbd89a621d3e3;p=octave.git

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 29230490..9b3089e5 100644
--- 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)
 
@@ -51,13 +50,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)
 	$(OCT_V_JAR)rm -f $@-t $@ && \
 	( cd scripts/java; \
 	  "$(JAR)" cf octave.jar-t $(JAVA_CLASSES) ) && \
 	mv $@-t $@
-endif
 
 %canon_reldir%dir = $(fcnfiledir)/java