diff options
author | Lluis Sanchez <lluis@xamarin.com> | 2014-04-30 17:55:42 +0400 |
---|---|---|
committer | Lluis Sanchez <lluis@xamarin.com> | 2014-04-30 17:55:42 +0400 |
commit | fb81c819ea4e881a24b3631e9767fb6ecafb47df (patch) | |
tree | cda0f870a57624298780a9686e872737b71705f9 | |
parent | f93d4bbe9e4f8143230601b92ac0fc27ecf2021f (diff) |
Fix F# binding build issue
Don't specify the prefix path when configuring the F# binding since
the binding assumes that MD is installed in that prefix, but that's
not correct when building MD itself.
-rwxr-xr-x | configure | 7 | ||||
-rw-r--r-- | profiles/mac | 2 |
2 files changed, 7 insertions, 2 deletions
@@ -155,12 +155,17 @@ configure_packages () enable_tests=" " fi + prefixarg="--prefix=$prefix" builddir=`pwd`/$path/build + for p in $ops ; do arg=`echo $p | cut -d '=' -f 1` if [ $arg == "--addins-dir" ] ; then builddir=`pwd`/$path/`echo $p | cut -d '=' -f 2` fi + if [ $p == "--no-prefix" ] ; then + prefixarg="" + fi done title="Configuring package: $path" @@ -180,7 +185,7 @@ configure_packages () exit 1 fi pushd $path > /dev/null - PKG_CONFIG_PATH=$localconf:$PKG_CONFIG_PATH $sct --prefix=$prefix $ops || handle_config_error + PKG_CONFIG_PATH=$localconf:$PKG_CONFIG_PATH $sct $prefixarg $ops || handle_config_error popd > /dev/null create_local_config $path $builddir packages="$packages $path" diff --git a/profiles/mac b/profiles/mac index 9e695ba066..91f5c8a42d 100644 --- a/profiles/mac +++ b/profiles/mac @@ -1,2 +1,2 @@ main --disable-update-mimedb --disable-update-desktopdb --disable-gnomeplatform --enable-macplatform --enable-tests -main/external/fsharpbinding/monodevelop --addins-dir=bin/mac-linux/Debug +main/external/fsharpbinding/monodevelop --addins-dir=bin/mac-linux/Debug --no-prefix |