summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Zou2016-03-19 10:23:47 +0100
committerMichel Zou2016-03-19 10:23:47 +0100
commitd96935ab5bfd6f442a7d420a8e5b428493047ec6 (patch)
treed595bd71c821569c6f7ba7a602ea09f54c06d3b2
parenta6d41eca14b67fc68be53891a417a1819cbfa430 (diff)
downloadaur-d96935ab5bfd6f442a7d420a8e5b428493047ec6.tar.gz
do not override WINEPREFIX
-rw-r--r--.SRCINFO2
-rw-r--r--mingw-wine.sh11
2 files changed, 9 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 71e4ee3810f0..75f67689223c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Sat Mar 19 07:35:19 UTC 2016
+# Sat Mar 19 09:23:47 UTC 2016
pkgbase = mingw-w64-cmake
pkgdesc = CMake wrapper for MinGW (mingw-w64)
pkgver = 1
diff --git a/mingw-wine.sh b/mingw-wine.sh
index 49f4bf73b47e..292e2f49aa31 100644
--- a/mingw-wine.sh
+++ b/mingw-wine.sh
@@ -14,6 +14,11 @@ then
fi
fi
-# run it in a temporary WINEPREFIX in /tmp/arch to not mess with default ~/.wine
-# also ~/.wine might be a user-defined 32 bits prefix, which will fail to run x86_64 exes
-WINEPREFIX=~/.wine-@TRIPLE@ wine "$@"
+# run it in a custom WINEPREFIX to not mess with default ~/.wine
+# also default prefix might be a 32 bits prefix, which will fail to run x86_64 exes
+if ! test -d "${WINEPREFIX}"
+then
+ WINEPREFIX=~/.wine-@TRIPLE@ wine "$@"
+else
+ wine "$@"
+fi