installer: sync with branch

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31237 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/Win32/packaging/AltInstaller/ConfigLyX.nsh b/development/Win32/packaging/AltInstaller/ConfigLyX.nsh
index 44c2e41071a7f236c38c2bde2956e970ce1456c8..6434c714999932e41d56109bb29118e22f6ec729 100644 (file)
--- 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 d8999a1233346e869bcd602344fcb84fc64d415b..beb5bb8c15737bd1619f7f812070e966f34597b6 100644 (file)
--- 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"