From c16d0a79c4064ef573293e610af469a82c1745cf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Sat, 10 Mar 2012 10:46:14 +0000 Subject: [PATCH] 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 --- .../Win32/packaging/installer/include/declarations.nsh | 2 +- development/Win32/packaging/installer/setup/configure.nsh | 2 +- development/Win32/packaging/installer/setup/install.nsh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh index 9c01f21803..b2e23b2587 100644 --- 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 e1e3658f73..4a93f74779 100644 --- 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 de678e856d..08f620d595 100644 --- 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 -- 2.39.2