aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2014-09-01 18:04:25 +0800
committerMilan Crha <mcrha@redhat.com>2014-09-01 18:04:25 +0800
commit86d2e46d59c8f2e40ba7ded99e48bf6f38925922 (patch)
tree9186289a768b858e7c32c1672bd96a6023239b76
parente3ee83bce2ba4c2b10d7412584596de386a6ae3a (diff)
downloadgsoc2013-evolution-86d2e46d59c8f2e40ba7ded99e48bf6f38925922.tar
gsoc2013-evolution-86d2e46d59c8f2e40ba7ded99e48bf6f38925922.tar.gz
gsoc2013-evolution-86d2e46d59c8f2e40ba7ded99e48bf6f38925922.tar.bz2
gsoc2013-evolution-86d2e46d59c8f2e40ba7ded99e48bf6f38925922.tar.lz
gsoc2013-evolution-86d2e46d59c8f2e40ba7ded99e48bf6f38925922.tar.xz
gsoc2013-evolution-86d2e46d59c8f2e40ba7ded99e48bf6f38925922.tar.zst
gsoc2013-evolution-86d2e46d59c8f2e40ba7ded99e48bf6f38925922.zip
[win32/setup-env] Correct GSETTINGS_SCHEMA_DIR value
It can contain only one folder, thus use the one from evolution's build directory. The dependency's folder might be added by a relative path from the glib's DLL file.
-rwxr-xr-xwin32/setup-env2
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/setup-env b/win32/setup-env
index 1b0cde5140..0d18e1496e 100755
--- a/win32/setup-env
+++ b/win32/setup-env
@@ -46,7 +46,7 @@ export PATH=$BUILD_ROOT_DEPS/bin:$BUILD_ROOT_EVO/bin:$PATH_DEFAULT
export LD_LIBRARY_PATH=$BUILD_ROOT_DEPS/lib:$BUILD_ROOT_EVO/lib:/lib
export PKG_CONFIG_PATH=$BUILD_ROOT_DEPS/lib/pkgconfig:$BUILD_ROOT_EVO/lib/pkgconfig:$BUILD_ROOT_DEPS/share/pkgconfig:$BUILD_ROOT_EVO/share/pkgconfig
export ACLOCAL_FLAGS="-I $BUILD_ROOT_DEPS/share/aclocal -I $BUILD_ROOT_EVO/share/aclocal -I /share/aclocal"
-export GSETTINGS_SCHEMA_DIR=$BUILD_ROOT_DEPS/share/glib-2.0/schemas:$BUILD_ROOT_EVO/share/glib-2.0/schemas
+export GSETTINGS_SCHEMA_DIR=$BUILD_ROOT_EVO/share/glib-2.0/schemas
if [ "$1" = "debug" -o "$2" = "debug" ] ; then
export CFLAGS="$CFLAGS -g -O0 -Wall -DMSVCRT_VERSION=710"
else