installer: port recent changes to trunk

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

diff --git a/development/Win32/packaging/AltInstaller/InstallActions-update.nsh b/development/Win32/packaging/AltInstaller/InstallActions-update.nsh
index 4087cab2de02e89f72c30ae7f9e5a065701fdac9..509c65d2b8fd33f1bc94817eb06d661e0d9344f4 100644 (file)
--- a/development/Win32/packaging/AltInstaller/InstallActions-update.nsh
+++ b/development/Win32/packaging/AltInstaller/InstallActions-update.nsh
@@ -187,10 +187,6 @@ Function InstDirChange
    StrCpy $FileName "session"
    Call CheckAppPathPreferences # function from LyXUtils.nsh
    
-   # set the new path to the lyx.bat file
-   # following macro from TextFunc.nsh # calls Function ReplaceLineContent from LyXUtils.nsh
-   ${LineFind} "$INSTDIR\bin\lyx.bat" "" "1:-1" "ReplaceLineContent" 
-   
    # set new path to ImageMagick
    ReadRegStr $ImageMagickPath SHCTX "SOFTWARE\Classes\Applications" "AutoRun"
    ${if} $ImageMagickPath != ""

diff --git a/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi b/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi
index 80423eb8f238877dbdc3ea3af280df18b1981f71..05e77b3292054046e39a50f9098f32d5fb5a09d8 100644 (file)
--- a/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi
+++ b/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi
@@ -51,6 +51,7 @@ Var InstallJabRef
 Var LangEncoding
 Var LangSysEncoding
 Var LaTeXName
+Var LangNameLyX
 Var MiKTeXVersion
 Var MiKTeXUser
 Var MiKTeXPath

diff --git a/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi b/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
index 086bebd1a49fb8062ceee8c13e3949ea80725981..54bb1cbd9f69c8502bf318cd8c4665cd7beec6df 100644 (file)
--- a/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
+++ b/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
@@ -49,6 +49,7 @@ Var ImageEditorPath
 Var LangEncoding
 Var LangSysEncoding
 Var LaTeXName
+Var LangNameLyX
 Var MiKTeXVersion
 Var MiKTeXUser
 Var MissedProg

diff --git a/development/Win32/packaging/AltInstaller/Variables.nsh b/development/Win32/packaging/AltInstaller/Variables.nsh
index 9e202774c9ee51c5fb4a709fa594b1b5c2cb4351..e31dd0c028b7add3a7cf8eaf5917bfd55e8461e1 100644 (file)
--- a/development/Win32/packaging/AltInstaller/Variables.nsh
+++ b/development/Win32/packaging/AltInstaller/Variables.nsh
@@ -15,7 +15,6 @@ Var JabRefInstalled
 Var LangCode
 Var LangCodeSys
 Var LangName
-Var LangNameLyX
 Var LangNameSys
 Var LatexPath
 Var MiKTeXInstalled