Mercurial > mxe-octave
changeset 3429:6cf5d50556d4
* tools/set-mxe-env.sh.in: Rename from tools/set_mxe_env.sh.in.
* configure.ac: Update.
* Makefile.in (clean): Delete generated tools/set-mxe-env.sh.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 16 Jan 2014 14:07:22 -0500 |
| parents | 652d7ef34921 |
| children | 2183ac663bcb |
| files | Makefile.in configure.ac tools/set-mxe-env.sh.in tools/set_mxe_env.sh.in |
| diffstat | 4 files changed, 30 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Thu Jan 16 13:46:06 2014 -0500 +++ b/Makefile.in Thu Jan 16 14:07:22 2014 -0500 @@ -630,6 +630,7 @@ rm -rf $(MSYS_BASE_DIR) $(NOTEPAD_BASE_DIR) rm -rf native-tools cross-tools octave gnuplot rm -f Makefile cmake-toolchain-file.stamp + rm -f tools/set-mxe-env.sh .PHONY: clean-pkg clean-pkg:
--- a/configure.ac Thu Jan 16 13:46:06 2014 -0500 +++ b/configure.ac Thu Jan 16 14:07:22 2014 -0500 @@ -147,7 +147,7 @@ MXE_ROOTDIR=`cd $srcdir; pwd` AC_SUBST(MXE_ROOTDIR) -AC_CONFIG_FILES([Makefile tools/set_mxe_env.sh]) +AC_CONFIG_FILES([Makefile tools/set-mxe-env.sh]) AC_OUTPUT
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/set-mxe-env.sh.in Thu Jan 16 14:07:22 2014 -0500 @@ -0,0 +1,28 @@ +#!/bin/bash +MXEDIR=@MXE_ROOTDIR@ + +if [ -z "$MXE_OCTAVE_ENV" ]; then + + 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) + + 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 +
--- a/tools/set_mxe_env.sh.in Thu Jan 16 13:46:06 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -#!/bin/bash -MXEDIR=@MXE_ROOTDIR@ - -if [ -z "$MXE_OCTAVE_ENV" ]; then - - 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) - - 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 -