The branch, master, has been updated. - Log -----------------------------------------------------------------
commit dab1b4bbc0d15389ef6339835928ef298853b72f Author: Uwe Stöhr <uwesto...@lyx.org> Date: Sat Nov 10 07:09:20 2012 +0100 installer: remove special handling of WMF converter metafile2eps is sine a while a real Windows printer therefore the former handling for the old program can go diff --git a/development/Win32/packaging/installer/include/variables.nsh b/development/Win32/packaging/installer/include/variables.nsh index 729dec4..d96b0b6 100644 --- a/development/Win32/packaging/installer/include/variables.nsh +++ b/development/Win32/packaging/installer/include/variables.nsh @@ -52,7 +52,6 @@ Var ThesCode Var ThesCodes Var UpdateFNDBReturn Var UserList -Var WMFPath Var LangName diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh index 925b432..8c3af60 100644 --- a/development/Win32/packaging/installer/setup/configure.nsh +++ b/development/Win32/packaging/installer/setup/configure.nsh @@ -117,9 +117,6 @@ Section -Configure ${if} $SVGPath != "" StrCpy $PathPrefix "$PathPrefix;$SVGPath" ${endif} - ${if} $WMFPath != "" - StrCpy $PathPrefix "$PathPrefix;$WMFPath" - ${endif} ${if} $GnumericPath != "" StrCpy $PathPrefix "$PathPrefix;$GnumericPath" ${endif} @@ -128,8 +125,8 @@ Section -Configure ${EndIf} ${if} $LilyPondPath != "" StrCpy $PathPrefix "$PathPrefix;$LilyPondPath" - ${endif} - + ${endif} + # Set the path prefix in lyxrc.dist ClearErrors Delete "$INSTDIR\Resources\lyxrc.dist" ----------------------------------------------------------------------- Summary of changes: .../packaging/installer/include/variables.nsh | 1 - .../Win32/packaging/installer/setup/configure.nsh | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) hooks/post-receive -- The LyX Source Repository