Mercurial > mxe-octave

changeset 3245:94042dd6ea1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Correctly update set_mxe_env.sh for native/non natibe builds * tools/set_mxe_env.sh.in: Set include,lib and path dependant on native build and set export variables from result.
author John Donoghue <john.donoghue@ieee.org>
date Tue, 03 Sep 2013 10:08:29 -0400
parents 929df089f40a
children 0e705514af1b
files tools/set_mxe_env.sh.in
diffstat 1 files changed, 19 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/tools/set_mxe_env.sh.in	Sun Sep 01 17:56:38 2013 -0400
+++ b/tools/set_mxe_env.sh.in	Tue Sep 03 10:08:29 2013 -0400
@@ -1,24 +1,28 @@
 #!/bin/bash
 MXEDIR=@MXE_ROOTDIR@
 
-if [ "@MXE_NATIVE_BUILD@" = "yes" ]; then
-  HOST=""
-else
-  HOST=$($MXEDIR/tools/config.guess)
-fi
-
 if [ -z "$MXE_OCTAVE_ENV" ]; then
 
-export PATH="$MXEDIR/usr/$HOST/bin:$MXEDIR/usr/bin:$PATH"
-export CPPFLAGS="-I$MXEDIR/usr/$HOST/include"
-export LDFLAGS="-L$MXEDIR/usr/$HOST/lib"
-export LD_LIBRARY_PATH="$MXEDIR/usr/$HOST/lib:$LD_LIBRARY_PATH"
-export PKG_CONFIG_PATH="$MXEDIR/usr/$HOST/lib/pkgconfig"
-export PKG_CONFIG="$MXEDIR/usr/bin/pkg-config@EXEEXT@"
+  if [ "@MXE_NATIVE_BUILD@" = "yes" ]; then
+    MXE_PATH="$MXEDIR/usr/bin"
+    MXE_INC_PATH="$MXEDIR/usr/include"
+    MXE_LIB_PATH="$MXEDIR/usr/lib"
+  else
+    HOST=$($MXEDIR/tools/config.guess)
 
-export MXE_OCTAVE_ENV=$MXEDIR
+    MXE_PATH="$MXEDIR/usr/$HOST/bin:$MXEDIR/usr/bin"
+    MXE_INC_PATH="$MXEDIR/usr/$HOST/include"
+    MXE_LIB_PATH="$MXEDIR/usr/$HOST/lib"
+  fi
+
+  export PATH="$MXE_PATH:$PATH"
+  export CPPFLAGS="-I$MXE_INC_PATH"
+  export LDFLAGS="-L$MXE_LIB_PATH"
+  export LD_LIBRARY_PATH="$MXE_LIB_PATH:$LD_LIBRARY_PATH"
+  export PKG_CONFIG_PATH="$MXE_LIB_PATH/pkgconfig"
+  export PKG_CONFIG="$MXEDIR/usr/bin/pkg-config@EXEEXT@"
+
+  export MXE_OCTAVE_ENV=$MXEDIR
 
 fi
 
-
-