[Libreoffice-commits] core.git: configure.ac

[David Ostrovsky]

 configure.ac |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 000e24d22d2e18c006277ec24148c7252c9f678d
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Mon Jan 12 22:33:31 2015 +0100

    Fix installer on x86_64 platform on windows
    
    Change-Id: I3020b648cae31e28de51e68177c0490e77733f4e
    Reviewed-on: https://gerrit.libreoffice.org/13878
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>
    Tested-by: David Ostrovsky <david at ostrovsky.org>

diff --git a/configure.ac b/configure.ac
index 3234a2b..d4029a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12711,6 +12711,10 @@ else
         if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
             LO_PATH=`cygpath -p -m "$PATH"`
         fi
+        if test "$BITNESS_OVERRIDE" = 64; then
+            # needed for msi packaging
+            pathmunge "$WINDOWS_SDK_HOME/bin/x86" "before"
+        fi
         pathmunge "$DOTNET_FRAMEWORK_HOME/bin" "before"
         pathmunge "$ASM_HOME" "before"
         pathmunge "$WINDOWS_SDK_HOME/bin" "before"