[Xfce4-commits] <midori:master> Set MIDORI_EXEC_PATH to PREFIX under Wine

[Christian Dywan]

Updating branch refs/heads/master
         to 569ad239f43885ed0e6a018febd66f41df514c05 (commit)
       from 0898d6a4e9a0e460fdfe5a1b212787d567a2ecff (commit)

commit 569ad239f43885ed0e6a018febd66f41df514c05
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Dec 16 20:36:38 2012 +0100

    Set MIDORI_EXEC_PATH to PREFIX under Wine

 katze/midori-paths.vala |    3 ++-
 wscript                 |    2 ++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/katze/midori-paths.vala b/katze/midori-paths.vala
index 9ff7460..5cced9f 100644
--- a/katze/midori-paths.vala
+++ b/katze/midori-paths.vala
@@ -250,7 +250,8 @@ namespace Midori {
             assert (command_line == null);
             command_line = new_command_line;
             #if HAVE_WIN32
-            exec_path = win32_get_package_installation_directory_of_module ();
+            exec_path = Environment.get_variable ("MIDORI_EXEC_PATH") ??
+                win32_get_package_installation_directory_of_module ();
             #else
             string? executable;
             try {
diff --git a/wscript b/wscript
index f8b85db..7946876 100644
--- a/wscript
+++ b/wscript
@@ -581,6 +581,8 @@ def shutdown ():
         # Avoid i18n-related false failures
         os.environ['LC_ALL'] = 'C'
         os.environ['UNIQUE_BACKEND'] = 'bacon'
+        if is_mingw (Build.bld.env):
+            os.environ['MIDORI_EXEC_PATH'] = Build.bld.env['PREFIX']
         test = UnitTest.unit_test ()
 
         reset_xdg_dirs ()