Mercurial > mxe-octave

changeset 3417:0182ffc974a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Download win32 jni.h ionly if java is enabled * src/octave.mk: only download jaava headers is ENABLE_JAVA = yes. * src/stable-octave.mk: only download jaava headers is ENABLE_JAVA = yes.
author John Donoghue <john.donoghue@ieee.org>
date Sun, 12 Jan 2014 20:08:46 -0500
parents 3d24cec05900
children 579d71e16ab2
files src/octave.mk src/stable-octave.mk
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/octave.mk	Sun Jan 12 01:05:00 2014 -0500
+++ b/src/octave.mk	Sun Jan 12 20:08:46 2014 -0500
@@ -83,7 +83,7 @@
 define $(PKG)_BUILD
 
     # jni install
-    if [[ "$(MXE_SYSTEM)" == "mingw" && "$(MXE_NATIVE_BUILD)" == "no" ]]; then \
+    if [[ "$(MXE_SYSTEM)" == "mingw" && "$(MXE_NATIVE_BUILD)" == "no" && "$(ENABLE_JAVA)" == "yes" ]]; then \
       mkdir -p '$(HOST_INCDIR)/java/include'; \
       $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h \
         -O $(HOST_INCDIR)/java/include/jni.h; \
--- a/src/stable-octave.mk	Sun Jan 12 01:05:00 2014 -0500
+++ b/src/stable-octave.mk	Sun Jan 12 20:08:46 2014 -0500
@@ -83,7 +83,7 @@
 
 define $(PKG)_BUILD
     # jni install
-    if [[ "$(MXE_SYSTEM)" == "mingw" && "$(MXE_NATIVE_BUILD)" == "no" ]]; then \
+    if [[ "$(MXE_SYSTEM)" == "mingw" && "$(MXE_NATIVE_BUILD)" == "no" && "$(ENABLE_JAVA)" == "yes" ]]; then \
       mkdir -p '$(HOST_INCDIR)/java/include'; \
       $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h \
         -O $(HOST_INCDIR)/java/include/jni.h; \