Mercurial > mxe-octave

changeset 3858:9ceedf18871e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use OCTAVE_CONFIG as octave-config variable name * makefile.am: fir pkg compile, use OCTAVE_CONFIG variable * src/of-sockets-1-cross-fixes.patch: update patch for OCTAVE_CONFIG
author John Donoghue <john.donoghue@ieee.org>
date Mon, 23 Mar 2015 19:34:25 -0400
parents c7505b1c28b1
children 74f53761f74d
files Makefile.in src/of-sockets-1-cross-fixes.patch
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Sun Mar 22 15:04:42 2015 -0400
+++ b/Makefile.in	Mon Mar 23 19:34:25 2015 -0400
@@ -593,12 +593,12 @@
     if [ -f '$(1)/src/configure' ]; then \
       cd '$(1)/src' && ./configure $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) MKOCTFILE='$(MXE_MKOCTFILE)' \
-        OCTAVECONFIG='$(MXE_OCTAVECONFIG)' \
+        OCTAVE_CONFIG='$(MXE_OCTAVECONFIG)' \
         $(4); \
     fi; \
     if [ -f '$(1)/src/Makefile' ]; then \
       $(MAKE) -C '$(1)/src' MKOCTFILE='$(MXE_MKOCTFILE) --verbose' \
-        OCTAVECONFIG='$(MXE_OCTAVECONFIG)'; \
+        OCTAVE_CONFIG='$(MXE_OCTAVECONFIG)'; \
     fi; \
   fi
 endef
--- a/src/of-sockets-1-cross-fixes.patch	Sun Mar 22 15:04:42 2015 -0400
+++ b/src/of-sockets-1-cross-fixes.patch	Mon Mar 23 19:34:25 2015 -0400
@@ -5,10 +5,10 @@
  SRC := $(OCT:.oct=.cc)
  
  MKOCTFILE ?= mkoctfile -Wall
-+OCTAVECONFIG ?= octave-config
++OCTAVE_CONFIG ?= octave-config
  OCTAVE ?= octave
  
-+CANONICAL_HOST_TYPE := $(shell $(OCTAVECONFIG) -p CANONICAL_HOST_TYPE))
++CANONICAL_HOST_TYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE))
 +
  #The following is necessary to get the sockets package working in Windows.
  #It has been tried on Win7 and XP, in Octave 3.8.0 using mxe-octave (mingw)