From 6ea89fa2551ee419bc7deedc0bac32c210aaacee Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Wed, 27 Jun 2012 01:58:04 +0200
Subject: [PATCH] fix 2 more installer issues

- LaTeX.nsh: the registry cannot be a variable
- declarations.nsh: remove doubled folder
---
 development/Win32/packaging/installer/include/LaTeX.nsh     | 6 +++++-
 .../Win32/packaging/installer/include/declarations.nsh      | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh b/development/Win32/packaging/installer/include/LaTeX.nsh
index 929531e4c9..d1b0168192 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -129,7 +129,11 @@ FunctionEnd
    ${endif}
    ${if} $PathLaTeX != ""
     # set package repository (MiKTeX's primary package repository)
-    WriteRegStr $MiKTeXUser "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" "Yes${APP_SERIES_KEY}" # special entry to tell the uninstaller that it was installed with LyX
+    ${if} $MiKTeXUser == "HKCU"
+     WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" "Yes${APP_SERIES_KEY}" # special entry to tell the uninstaller that it was installed with LyX
+    ${else}
+     WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" "Yes${APP_SERIES_KEY}"
+    ${endif}
     StrCpy $LaTeXInstalled "MiKTeX"
     StrCpy $MiKTeXVersion ${MiKTeXDeliveredVersion}
    ${else}
diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh
index 0735617839..dd420ac88c 100644
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -54,8 +54,8 @@ Configuration of LyX installer
 !define APP_RUN "bin\lyx.exe"
 
 !define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}" # like "LyX200"
-!define APP_REGKEY_SETUP "Software\${APP_REGKEY}\Setup"
-!define APP_REGKEY_SETTINGS "Software\${APP_REGKEY}\Settings"
+!define APP_REGKEY_SETUP "${APP_REGKEY}\Setup"
+!define APP_REGKEY_SETTINGS "${APP_REGKEY}\Settings"
 
 !define APP_REGNAME_DOC "${APP_NAME}.Document"
 
-- 
2.39.2