From 3d8905fc3633c6c0352c03990e723657820aaea3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20St=C3=B6hr?= <uwestoehr@web.de>
Date: Fri, 19 Aug 2011 22:19:09 +0000
Subject: [PATCH] installer: fix now all compiler warnings

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39497 a592a061-630c-0410-9148-cb99ea01b6c8
---
 .../packaging/installer/include/variables.nsh    |  4 +++-
 .../Win32/packaging/installer/setup/install.nsh  | 16 ++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/development/Win32/packaging/installer/include/variables.nsh b/development/Win32/packaging/installer/include/variables.nsh
index d467f128a0..7f7474a2d3 100644
--- a/development/Win32/packaging/installer/include/variables.nsh
+++ b/development/Win32/packaging/installer/include/variables.nsh
@@ -24,7 +24,9 @@ Var DelPythonFiles
 Var EditorPath
 Var GhostscriptPath
 Var ImageEditorPath
-Var InstallJabRef
+!if ${SETUPTYPE} == BUNDLE
+ Var InstallJabRef
+!endif
 Var JabRefInstalled
 Var LaTeXName
 Var LaTeXInstalled
diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh
index 26463f1a6a..fe49702472 100644
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -11,7 +11,7 @@ Installation of program files, dictionaries and external components
 
 Var PythonCompileFile
 Var PythonCompileReturn
-Var DownloadResult
+#Var DownloadResult
 
 Section -ProgramFiles SecProgramFiles
 
@@ -112,7 +112,7 @@ Section -ProgramFiles SecProgramFiles
      ${endif}
     ${endif}
    ${endif}
-  !endif
+  !endif # end if BUNDLE
   
    # install eLyXer as Python module
    ExecWait '"$INSTDIR\python\python.exe" "$INSTDIR\python\setup.py" install'
@@ -155,8 +155,8 @@ SectionEnd
 #--------------------------------
 # Extenral components
 
-Var PathAllUsers
-Var PathCurrentUser
+#Var PathAllUsers
+#Var PathCurrentUser
 
 !macro EXTERNAL COMPONENT
 
@@ -184,10 +184,10 @@ Var PathCurrentUser
       
     ExecWait '"$PLUGINSDIR\${COMPONENT}Setup.exe"'
     
-    # Updates the path environment variable of the instaler process to the latest system value
-    ReadRegStr $PathAllUsers HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" Path
-    ReadRegStr $PathCurrentUser HKCU "Environment" Path
-    System::Call 'kernel32::SetEnvironmentVariableA(t, t) i("Path", "$PathAllUsers;$PathCurrentUser").'
+    # Updates the path environment variable of the installer process to the latest system value
+#    ReadRegStr $PathAllUsers HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" Path
+#    ReadRegStr $PathCurrentUser HKCU "Environment" Path
+#    System::Call 'kernel32::SetEnvironmentVariableA(t, t) i("Path", "$PathAllUsers;$PathCurrentUser").'
 
     Call Search${COMPONENT}
     
-- 
2.39.5