use environment variable to locate Windows directory

[lyx.git] / development / Win32 / packaging / installer / settings.user.nsh

diff --git a/development/Win32/packaging/installer/settings.user.nsh b/development/Win32/packaging/installer/settings.user.nsh
index c678e1471ffe8c32d7b6b22939abee32612e684e..7195fb14b1fafa5559357dd505f89dd30cdf211a 100644 (file)
--- a/development/Win32/packaging/installer/settings.user.nsh
+++ b/development/Win32/packaging/installer/settings.user.nsh
@@ -5,35 +5,27 @@
 #Location of LyX files and dependencies\r
 \r
 !ifdef FilesLyX\r
-!define FILES_LYX "${FilesLyX}"\r
+  !define FILES_LYX "${FilesLyX}"\r
 !else\r
-!define FILES_LYX "..\..\..\..\build-msvc"\r
+  !define FILES_LYX "..\..\..\..\build-msvc"\r
 !endif\r
 \r
 !ifdef FilesDeps\r
-!define FILES_DEPS "${FilesDeps}"\r
+  !define FILES_DEPS "${FilesDeps}"\r
 !else\r
-!define FILES_DEPS "..\..\..\..\lyx-windows-deps-msvc-qt4"\r
+  !define FILES_DEPS "..\..\..\..\lyx-windows-deps-msvc-qt4"\r
 !endif\r
 \r
 !ifdef FilesBundle\r
-!define FILES_BUNDLE "${FilesBundle}"\r
+  !define FILES_BUNDLE "${FilesBundle}"\r
 !else\r
-!define FILES_BUNDLE "..\..\..\..\lyx-windows-bundle-deps"\r
-!endif\r
-\r
-#Location of Windows installation\r
-\r
-!ifdef FilesWindows\r
-!define FILES_WINDOWS "${FilesWindows}"\r
-!else\r
-!define FILES_WINDOWS "C:\WINDOWS"\r
+  !define FILES_BUNDLE "..\..\..\..\lyx-windows-bundle-deps"\r
 !endif\r
 \r
 #Location of Python 2.5\r
 \r
 !ifdef FilesPython\r
-!define FILES_PYTHON "${FilesPython}"\r
+  !define FILES_PYTHON "${FilesPython}"\r
 !else\r
-!define FILES_PYTHON "C:\Python25"\r
+  !define FILES_PYTHON "C:\Python25"\r
 !endif\r