From ad0ebcdb1d0836169dc62319e64905b9d97e888d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@web.de>
Date: Mon, 5 Sep 2011 07:20:53 +0000
Subject: [PATCH] installer: - fix bug that LyX's LaTeX files were tried to
 install although the user denied to use LaTeX.nsh - propose to add a desktop
 item for LyX (can be switched off by the user)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39584 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/Win32/packaging/installer/include/LaTeX.nsh | 3 +++
 development/Win32/packaging/installer/include/init.nsh  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh b/development/Win32/packaging/installer/include/LaTeX.nsh
index 735e51dc18..66b9a8f85f 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -146,6 +146,8 @@ Function ConfigureMiKTeX
  # installs the LaTeX class files that are delivered with LyX
  # and enable MiKTeX's automatic package installation
  
+ # install LyX's LaTeX class and style files
+ ${if} $PathLaTeX != ""
   ${if} $MultiUser.Privileges != "Admin"
   ${orif} $MultiUser.Privileges != "Power"
    StrCpy $PathLaTeXLocal "$PathLaTeX" -11 # delete "\miktex\bin"
@@ -170,6 +172,7 @@ Function ConfigureMiKTeX
    ${endif}
    Pop $UpdateFNDBReturn # Return value
   ${endif}
+ ${endif}
   
   # enable package installation without asking (1 = Yes, 0 = No, 2 = Ask me first)
   WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall" "1" # if only for current user
diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh
index 2f9e32d1a0..43f428c083 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -199,7 +199,7 @@ SectionEnd
 Section "$(SecFileAssocTitle)" SecFileAssoc
   StrCpy $CreateFileAssociations "true"
 SectionEnd
-Section /o "$(SecDesktopTitle)" SecDesktop
+Section "$(SecDesktopTitle)" SecDesktop
   StrCpy $CreateDesktopIcon "true"
 SectionEnd