# HG changeset patch # User Anirudha Bose # Date 1379533885 -19800 # Node ID 63e8822bbc2f9a377cd524b1cfd8b059e46d8033 # Parent c71810147e819cc04b3997779ff1032e089b0cdb src/octave.mk: Fixed incorrectly named variables diff --git a/src/octave.mk b/src/octave.mk --- 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) \