diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index 53444ef23a..3a02b672dc 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,5 +1,7 @@ Changelog for LyX-206-2: - fix bug that View/Export a file as HTML did not work. +- enable to use multiple indexes also with 64bit-MiKTeX +- updated to Python 2.7.5 Changelog for LyX-206-1: diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh b/development/Win32/packaging/installer/include/LaTeX.nsh index 1d9a6608a2..00784601b1 100644 --- a/development/Win32/packaging/installer/include/LaTeX.nsh +++ b/development/Win32/packaging/installer/include/LaTeX.nsh @@ -300,24 +300,24 @@ Function ConfigureMiKTeX # move the files to the correct location for 64bit ${if} $Is64bit == "true" CopyFiles /SILENT /FILESONLY "$3\miktex\bin\*.*" "$PathLaTeX" + CreateDirectory "$3\miktex\bin\x64\lib" + CopyFiles /SILENT "$3\miktex\bin\lib\*.*" "$3\miktex\bin\x64\lib" + RMDir /r "$3\miktex\bin\lib" Delete "$3\miktex\bin\*.*" - CreateDirectory "$3\miktex\bin\lib" - CopyFiles /SILENT "$3\miktex\lib\*.*" "$3\miktex\bin\lib" - RMDir /r "$3\miktex\lib" ${endif} ${endif} ${endif} - ${else} + ${else} # if admin or power user ${ifnot} ${FileExists} "$PathLaTeX\perl.exe" SetOutPath "$PathLaTeXLocal" File /r ${FILES_MIKTEX} # move the files to the correct location for 64bit ${if} $Is64bit == "true" CopyFiles /SILENT /FILESONLY "$PathLaTeXLocal\miktex\bin\*.*" "$PathLaTeX" + CreateDirectory "$PathLaTeXLocal\miktex\bin\x64\lib" + CopyFiles /SILENT "$PathLaTeXLocal\miktex\bin\lib\*.*" "$PathLaTeXLocal\miktex\bin\x64\lib" + RMDir /r "$PathLaTeXLocal\miktex\bin\lib" Delete "$PathLaTeXLocal\miktex\bin\*.*" - CreateDirectory "$PathLaTeXLocal\miktex\bin\lib" - CopyFiles /SILENT "$PathLaTeXLocal\miktex\lib\*.*" "$PathLaTeXLocal\miktex\bin\lib" - RMDir /r "$PathLaTeXLocal\miktex\lib" ${endif} ${endif} ${endif}