[LyX master] fix 2 more installer issues

[Uwe Stöhr]

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 6ea89fa2551ee419bc7deedc0bac32c210aaacee
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Wed Jun 27 01:58:04 2012 +0200

    fix 2 more installer issues
    
    - LaTeX.nsh: the registry cannot be a variable
    - declarations.nsh: remove doubled folder

diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh 
b/development/Win32/packaging/installer/include/LaTeX.nsh
index 929531e..d1b0168 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 0735617..dd420ac 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"
 

-----------------------------------------------------------------------

Summary of changes:
 .../Win32/packaging/installer/include/LaTeX.nsh    |    6 +++++-
 .../packaging/installer/include/declarations.nsh   |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository