diff options
| author | Stefan Hacker <dd0t@users.sourceforge.net> | 2012-12-18 15:30:40 +0400 |
|---|---|---|
| committer | Stefan Hacker <dd0t@users.sourceforge.net> | 2012-12-18 15:30:40 +0400 |
| commit | e9ce44abf92ef9358677f7a05fda9263836c6ddc (patch) | |
| tree | 3264e0511189109d9d84806da4f08aedc7d2ee39 /installer | |
| parent | 24b61482925f097d1de1a12bd8b13d0234b14ea3 (diff) | |
Make sure we don't accidently add spaces to installer paths
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/Settings.wxi | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/installer/Settings.wxi b/installer/Settings.wxi index 956d3b89e..6b78bbb51 100644 --- a/installer/Settings.wxi +++ b/installer/Settings.wxi @@ -8,19 +8,19 @@ <?ifndef env.MumbleSourceDir ?> <?define SourceDir = "\dev\mumble" ?> <?else ?> - <?define SourceDir = $(env.MumbleSourceDir) ?> + <?define SourceDir = "$(env.MumbleSourceDir)" ?> <?endif ?> <?ifndef env.MumbleQtDir ?> <?define QtDir = "\dev\QtMumble" ?> <?else ?> - <?define QtDir = $(env.MumbleQtDir) ?> + <?define QtDir = "$(env.MumbleQtDir)" ?> <?endif ?> <?ifndef env.MumbleDebugToolsDir ?> <?define DebugToolsDir = "C:\Program Files (x86)\Debugging Tools for Windows (x86)" ?> <?else ?> - <?define DebugToolsDir = $(env.MumbleDebugToolsDir) ?> + <?define DebugToolsDir = "$(env.MumbleDebugToolsDir)" ?> <?endif ?> <?ifndef env.MumbleSndFileDir ?> @@ -28,7 +28,7 @@ <?define SndFileDir = "\Program Files (x86)\Mega-Nerd\libsndfile\bin" ?> <?endif ?> <?else ?> - <?define SndFileDir = $(env.MumbleSndFileDir) ?> + <?define SndFileDir = "$(env.MumbleSndFileDir)" ?> <?endif ?> <?ifndef env.MumbleMySQLDir ?> @@ -36,7 +36,7 @@ <?define MySQLDir = "\dev\MySQL" ?> <?endif ?> <?else ?> - <?define MySQLDir = $(env.MumbleMySQLDir) ?> + <?define MySQLDir = "$(env.MumbleMySQLDir)" ?> <?endif ?> <?ifndef env.MumbleIceDir ?> @@ -44,19 +44,19 @@ <?define IceDir = "\Program Files (x86)\ZeroC\Ice-3.4.2\bin\vc100" ?> <?endif ?> <?else ?> - <?define IceDir = $(env.MumbleIceDir) ?> + <?define IceDir = "$(env.MumbleIceDir)" ?> <?endif ?> <?ifndef env.MumbleOpenSslDir ?> <?define OpenSslDir = "\dev\openssl" ?> <?else ?> - <?define OpenSslDir = $(MumbleOpenSslDir) ?> + <?define OpenSslDir = "$(MumbleOpenSslDir)" ?> <?endif ?> <?ifndef env.MumbleZlibDir ?> <?define ZlibDir = "\dev\zlib" ?> <?else ?> - <?define ZlibDir = $(env.MumbleZlibDir) ?> + <?define ZlibDir = "$(env.MumbleZlibDir)" ?> <?endif ?> <?ifndef env.MumbleMergeModuleDir ?> @@ -64,7 +64,7 @@ <?define MergeModuleDir = "C:\Program Files (x86)\Common Files\Merge Modules" ?> <?endif ?> <?else ?> - <?define MergeModuleDir = $(env.MumbleMergeModuleDir) ?> + <?define MergeModuleDir = "$(env.MumbleMergeModuleDir)" ?> <?endif ?> <!-- Environment flags to disable features. Value doesn't matter --> |