From 7a3001529601ea06fb250f7e85a0968202ab8573 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Wed, 15 May 2019 21:37:10 -0700
Subject: [PATCH] Fix some paths

---
 builders/windows-builder.py | 3 +++
 windows/config-appveyor.ini | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/builders/windows-builder.py b/builders/windows-builder.py
index 04fc297..d9614d6 100644
--- a/builders/windows-builder.py
+++ b/builders/windows-builder.py
@@ -326,6 +326,7 @@ class WindowsBuilder(Builder):
         config_defaults.update({
             'pyroot': self.python_root,
             'progfiles': self.program_files,
+            'progfilesx86': self.program_files_x86,
             'sitepackages': self.site_packages,
             'projects': os.path.abspath(os.path.join(self.script_path, '..', '..'))
         })
@@ -358,8 +359,10 @@ class WindowsBuilder(Builder):
         self.python_root = os.path.dirname(self.python)
         self.site_packages = os.path.join(self.python_root, 'Lib', 'site-packages')
         self.program_files = os.getenv('PROGRAMFILES')
+        self.program_files_x86 = os.getenv('PROGRAMFILES(x86)')
         self._print_verbose('   {:.<20}: {}'.format('site packages: ', self.site_packages))
         self._print_verbose('   {:.<20}: {}'.format('program files: ', self.program_files))
+        self._print_verbose('   {:.<20}: {}'.format('program files x86: ', self.program_files_x86))
 
     def setup_paths(self):
         """
diff --git a/windows/config-appveyor.ini b/windows/config-appveyor.ini
index 0288d0c..134f83a 100644
--- a/windows/config-appveyor.ini
+++ b/windows/config-appveyor.ini
@@ -1,13 +1,13 @@
 [executables]
 sphinx = %(pyroot)s\Scripts\sphinx-build.exe
-pyinstaller = %(pyroot)s\Scripts\pyinstaller-script.py
+pyinstaller = %(pyroot)s\Scripts\pyinstaller.exe
 htmlhelp = %(progfiles)s\HTML Help Workshop\hhc.exe
 lrelease = C:\Qt\5.12\msvc2017\bin\lrelease.exe
 portablelauncher = %(here)s\..\..\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe
 portableinstaller = %(here)s\..\..\PortableApps.comInstaller\PortableApps.comInstaller.exe
 mutool = %(here)s\..\..\mupdf-1.14.0-windows\mutool.exe
-candle = %(progfiles)s\WiX Toolset v3.11\bin\candle.exe
-light = %(progfiles)s\WiX Toolset v3.11\bin\light.exe
+candle = %(progfilesx86)s\WiX Toolset v3.11\bin\candle.exe
+light = %(progfilesx86)s\WiX Toolset v3.11\bin\light.exe
 
 [paths]
 branch = %(projects)s\openlp-branch