Mercurial > mxe-octave

comparison src/of-sockets-1-cross-fixes.patch @ 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 85568f3159a4
children
comparison
equal deleted inserted replaced
3857:c7505b1c28b1 3858:9ceedf18871e
3 +++ octave-sockets-1.2.0/src/Makefile 2015-03-20 11:31:54.325799984 -0400 3 +++ octave-sockets-1.2.0/src/Makefile 2015-03-20 11:31:54.325799984 -0400
4 @@ -8,12 +8,15 @@ 4 @@ -8,12 +8,15 @@
5 SRC := $(OCT:.oct=.cc) 5 SRC := $(OCT:.oct=.cc)
6 6
7 MKOCTFILE ?= mkoctfile -Wall 7 MKOCTFILE ?= mkoctfile -Wall
8 +OCTAVECONFIG ?= octave-config 8 +OCTAVE_CONFIG ?= octave-config
9 OCTAVE ?= octave 9 OCTAVE ?= octave
10 10
11 +CANONICAL_HOST_TYPE := $(shell $(OCTAVECONFIG) -p CANONICAL_HOST_TYPE)) 11 +CANONICAL_HOST_TYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE))
12 + 12 +
13 #The following is necessary to get the sockets package working in Windows. 13 #The following is necessary to get the sockets package working in Windows.
14 #It has been tried on Win7 and XP, in Octave 3.8.0 using mxe-octave (mingw) 14 #It has been tried on Win7 and XP, in Octave 3.8.0 using mxe-octave (mingw)
15 EXTRALIBS := 15 EXTRALIBS :=
16 -ifeq ($(OS),Windows_NT) 16 -ifeq ($(OS),Windows_NT)