From d6f7945761ab4178470b03cb91d7b2d8a1f6e03f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@web.de>
Date: Sat, 29 Aug 2009 20:42:00 +0000
Subject: [PATCH] installer: sync with branch

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31237 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/Win32/packaging/AltInstaller/ConfigLyX.nsh       | 2 ++
 development/Win32/packaging/AltInstaller/MissingPrograms.nsh | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/development/Win32/packaging/AltInstaller/ConfigLyX.nsh b/development/Win32/packaging/AltInstaller/ConfigLyX.nsh
index 44c2e41071..6434c71499 100644
--- a/development/Win32/packaging/AltInstaller/ConfigLyX.nsh
+++ b/development/Win32/packaging/AltInstaller/ConfigLyX.nsh
@@ -30,6 +30,8 @@ Function ConfigureLyX
   ${if} $WMFPath != ""
    StrCpy $PathPrefix "$PathPrefix;$WMFPath"
   ${endif}
+  # eLyXer is always available
+  #StrCpy $PathPrefix "$PathPrefix;${PRODUCT_SOURCEDIR}\etc\elyxer"
   
   # Create a batch file to start LyX with the environment variables set
   ClearErrors
diff --git a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh b/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
index d8999a1233..beb5bb8c15 100644
--- a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
+++ b/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
@@ -146,6 +146,9 @@ Function MissingPrograms
   ${if} $BibTeXEditorPath == ""
    ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.4.2" "UninstallString"
   ${endif}
+  ${if} $BibTeXEditorPath == ""
+   ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.5" "UninstallString"
+  ${endif}
   
   # test if Inkscape is installed
   ReadRegStr $SVGPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Inkscape" "InstallLocation"