installer: Python files belong to the Lib folder of Python

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

diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh
index 9c01f218034dd87ed12e81ea77e725ccae5c4e9a..b2e23b2587217d16b48ec8a1ea21686f1fccac3b 100644 (file)
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -13,7 +13,7 @@ Configuration of LyX installer
 !define FILES_ICONS "icons"
 !define FILES_PDFVIEW "${FILES_DEPS}\bin"
 !define FILES_MSVC "${FILES_DEPS}\bin"
-!define FILES_PYTHON "${FILES_DEPS}\python"
+!define FILES_PYTHON "${FILES_DEPS}\Python"
 !define FILES_ELYXER "${FILES_DEPS}\bin"
 !define FILES_UNOCONV "${FILES_DEPS}\bin"
 !define FILES_IMAGEMAGICK "${FILES_DEPS}\imagemagick"

diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index e1e3658f7302eac60943f5b2ae55990e8b18b983..4a93f74779e55c538d196727c5adf214ae505aaa 100644 (file)
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -95,7 +95,7 @@ Section -Configure
 
   # create the path prefix
   # $$ represents a literal $ in an NSIS string
-  StrCpy $PathPrefix "$$LyXDir\bin;$$LyXDir\python;$$LyXDir\imagemagick"
+  StrCpy $PathPrefix "$$LyXDir\bin;$$LyXDir\Python;$$LyXDir\Python\Lib;$$LyXDir\imagemagick"
   
   ${if} $PathLaTeX != ""
     StrCpy $PathPrefix "$PathPrefix;$PathLaTeX"

diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh
index de678e856d7d7ab9231dddf59105daee6e65f98e..08f620d595d6fdc0e63ddc5a74034fa2f0ee75f7 100644 (file)
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -118,11 +118,11 @@ Section -ProgramFiles SecProgramFiles
   !endif # end if BUNDLE
   
    # install eLyXer
-   SetOutPath "$INSTDIR\bin"
+   SetOutPath "$INSTDIR\Python\Lib"
    !insertmacro FileListeLyXer File "${FILES_ELYXER}\"
    
    # install unoconv
-   SetOutPath "$INSTDIR\python\Lib"
+   SetOutPath "$INSTDIR\Python\Lib"
    !insertmacro FileListUnoConv File "${FILES_UNOCONV}\"
 
   # install the LaTeX class files that are delivered with LyX