anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix 2 more installer issues

Browse Source 
- LaTeX.nsh: the registry cannot be a variable
- declarations.nsh: remove doubled folder
This commit is contained in:
Uwe Stöhr 2012-06-27 01:58:04 +02:00
parent fea35ef2c6
commit 6ea89fa255
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
development/Win32/packaging/installer/include/LaTeX.nsh
View File

@ -129,7 +129,11 @@ FunctionEnd
${endif} ${endif}
${if} $PathLaTeX != "" ${if} $PathLaTeX != ""
# set package repository (MiKTeX's primary package repository) # 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 $LaTeXInstalled "MiKTeX"
StrCpy $MiKTeXVersion ${MiKTeXDeliveredVersion} StrCpy $MiKTeXVersion ${MiKTeXDeliveredVersion}
${else} ${else}

4
development/Win32/packaging/installer/include/declarations.nsh
View File

@ -54,8 +54,8 @@ Configuration of LyX installer
!define APP_RUN "bin\lyx.exe" !define APP_RUN "bin\lyx.exe"
!define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}" # like "LyX200" !define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}" # like "LyX200"
!define APP_REGKEY_SETUP "Software\${APP_REGKEY}\Setup" !define APP_REGKEY_SETUP "${APP_REGKEY}\Setup"
!define APP_REGKEY_SETTINGS "Software\${APP_REGKEY}\Settings" !define APP_REGKEY_SETTINGS "${APP_REGKEY}\Settings"
!define APP_REGNAME_DOC "${APP_NAME}.Document" !define APP_REGNAME_DOC "${APP_NAME}.Document"