Mercurial > hg > mxe-octave-anirudha

changeset 3207:63e8822bbc2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/octave.mk: Fixed incorrectly named variables
author Anirudha Bose <ani07nov@gmail.com>
date Thu, 19 Sep 2013 01:21:25 +0530
parents c71810147e81
children f8a423fb7cc1
files src/octave.mk
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/octave.mk
+++ b/src/octave.mk
@@ -33,7 +33,7 @@
       FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \
       gl_cv_func_gettimeofday_clobber=no
 
-    $MINGW_JAVA_CONFIG_OPTIONS := \
+    MINGW_JAVA_CONFIG_OPTIONS := \
       --with-java-homedir="$(HOST_PREFIX)/include/java" \
       --with-java-includedir="$(HOST_PREFIX)/include/java" \
 
@@ -86,20 +86,18 @@
 
 define $(PKG)_BUILD
     if [[ "$(MXE_NATIVE_MINGW_BUILD)" != yes && "$(MXE_SYSTEM)" == mingw ]]; then \
-        mkdir '$(1)/.build' ; \
-	mkdir -p '$(HOST_PREFIX)/include/java/include' ; \
+        mkdir -p '$(HOST_PREFIX)/include/java/include' ; \
 	$(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h -O $(HOST_PREFIX)/include/java/include/jni.h ; \
 	mkdir -p '$(HOST_PREFIX)/include/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_PREFIX)/include/java/include/win32/jni_md.h; \
-    else \
-	mkdir '$(1)/.build' ; \
     fi
+    mkdir '$(1)/.build'
     cd '$(1)' && autoreconf -W none
     cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$($(PKG)_PREFIX)' \
-	$($MINGW_JAVA_CONFIG_OPTIONS) \
+	$(MINGW_JAVA_CONFIG_OPTIONS) \
 	$($(PKG)_SPARSE_MATRIX_CONFIG_OPTIONS) \
 	--enable-docs \
         $($(PKG)_BLAS_OPTION) \