From: Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org>
Date: Mon, 1 Dec 2014 20:25:52 +0000 (+0000)
Subject: always-build-octave-jar
X-Git-Tag: archive/raspbian/4.4.1-6+rpi1~1^2^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e4d28bb74d4f3e5233cdd8ab5f9f6db973350413;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 fe6b9892..1a9aa889 100644
--- a/scripts/java/module.mk
+++ b/scripts/java/module.mk
@@ -1,3 +1,6 @@
+JAVAC=javac
+JAR=jar
+
 FCN_FILE_DIRS += java
 
 java_FCN_FILES = \
@@ -16,13 +19,10 @@ PKG_ADD_FILES += java/PKG_ADD
 
 DIRSTAMP_FILES += java/$(octave_dirstamp)
 
-if AMCOND_HAVE_JAVA
 JAR_FILES += java/octave.jar
-endif
 
 org_octave_dir = org/octave
 
-if AMCOND_HAVE_JAVA
 JAVA_SRC = \
   $(org_octave_dir)/ClassHelper.java \
   $(org_octave_dir)/OctClassLoader.java \
@@ -33,7 +33,6 @@ JAVA_SRC = \
   $(org_octave_dir)/DlgListener.java \
   $(org_octave_dir)/TeXtranslator.java \
   $(org_octave_dir)/TeXcode.java
-endif
 
 JAVA_CLASSES = $(JAVA_SRC:.java=.class)
 
@@ -63,11 +62,9 @@ java/images.stamp: $(srcdir_java_JAVA_IMAGES)
 	fi
 	touch $@
 
-if AMCOND_HAVE_JAVA
 java/octave.jar: java/images.stamp $(java_JAVA_CLASSES)
 	( cd java; "$(JAR)" cf octave.jar.t $(JAVA_CLASSES) $(JAVA_IMAGES) )
 	mv $@.t $@
-endif
 
 EXTRA_DIST += $(JAR_FILES) $(java_JAVA_SRC) $(java_JAVA_IMAGES)