# HG changeset patch # User John Donoghue # Date 1389575326 18000 # Node ID 0182ffc974a1c899e5e22fb823359d5b1cf24ec5 # Parent 3d24cec059006a7c1430eeaef485a012f7d149b7 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. diff -r 3d24cec05900 -r 0182ffc974a1 src/octave.mk --- 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; \ diff -r 3d24cec05900 -r 0182ffc974a1 src/stable-octave.mk --- 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; \