# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1392553311 18000
# Node ID 3b5b776331f1cb2ade6ff99a41ef7b46fbc7e9ce
# Parent  a551b373abc42c398ee28f9c3c5f960c81a4d2b3
Only download java .h files if not already available

* src/stable-octave.mk, src/octave.mk: download java .h files if not already available. Dont set both java home dir and include dir.

diff -r a551b373abc4 -r 3b5b776331f1 src/octave.mk
--- a/src/octave.mk	Wed Feb 12 18:23:02 2014 -0500
+++ b/src/octave.mk	Sun Feb 16 07:21:51 2014 -0500
@@ -25,8 +25,7 @@
   ifeq ($(MXE_SYSTEM),mingw)
     ifeq ($(MXE_NATIVE_BUILD),no)
       $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := \
-       --with-java-homedir="$(HOST_INCDIR)/java" \
-       --with-java-includedir="$(HOST_INCDIR)/java"
+       --with-java-homedir="$(HOST_INCDIR)/java" 
      endif
   endif
 endif
@@ -85,12 +84,16 @@
 
     # jni install
     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; \
-      mkdir -p '$(HOST_INCDIR)/java/include/win32'; \
-      $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/windows/javavm/export/jni_md.h \
-        -O $(HOST_INCDIR)/java/include/win32/jni_md.h; \
+      if [ ! -f $(HOST_INCDIR)/java/include/jni.h ]; 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; \
+      fi; \
+      if [ ! -f $(HOST_INCDIR)/java/include/win32/jni_md.h ]; then \
+        mkdir -p '$(HOST_INCDIR)/java/include/win32'; \
+        $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/windows/javavm/export/jni_md.h \
+          -O $(HOST_INCDIR)/java/include/win32/jni_md.h; \
+      fi; \
     fi
 
     mkdir '$(1)/.build'
diff -r a551b373abc4 -r 3b5b776331f1 src/stable-octave.mk
--- a/src/stable-octave.mk	Wed Feb 12 18:23:02 2014 -0500
+++ b/src/stable-octave.mk	Sun Feb 16 07:21:51 2014 -0500
@@ -25,8 +25,7 @@
   ifeq ($(MXE_SYSTEM),mingw)
     ifeq ($(MXE_NATIVE_BUILD),no)
       $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := \
-       --with-java-homedir="$(HOST_INCDIR)/java" \
-       --with-java-includedir="$(HOST_INCDIR)/java"
+       --with-java-homedir="$(HOST_INCDIR)/java" 
      endif
   endif
 endif
@@ -85,12 +84,16 @@
 define $(PKG)_BUILD
     # jni install
     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; \
-      mkdir -p '$(HOST_INCDIR)/java/include/win32'; \
-      $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/windows/javavm/export/jni_md.h \
-        -O $(HOST_INCDIR)/java/include/win32/jni_md.h; \
+      if [ ! -f $(HOST_INCDIR)/java/include/jni.h ]; 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; \
+      fi; \
+      if [ ! -f $(HOST_INCDIR)/java/include/win32/jni_md.h ]; then \
+        mkdir -p '$(HOST_INCDIR)/java/include/win32'; \
+        $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/windows/javavm/export/jni_md.h \
+          -O $(HOST_INCDIR)/java/include/win32/jni_md.h; \
+      fi; \
     fi
 
     mkdir '$(1)/.build'