From ad145f7a866bf3178a96d137daa211f08da8e4fe Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Fri, 17 Jun 2005 08:52:01 +0000 Subject: [PATCH] Uwe's GPL Ghostscript patch git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@10082 a592a061-630c-0410-9148-cb99ea01b6c8 --- .../Win32/packaging/installer/lyx_installer.nsi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/development/Win32/packaging/installer/lyx_installer.nsi b/development/Win32/packaging/installer/lyx_installer.nsi index bd581add0a..d6fe5515b9 100644 --- a/development/Win32/packaging/installer/lyx_installer.nsi +++ b/development/Win32/packaging/installer/lyx_installer.nsi @@ -516,8 +516,16 @@ FunctionEnd Function SearchGhostscript ; Find which version of ghostscript, if any, is installed. EnumRegKey $1 HKLM "Software\AFPL Ghostscript" 0 + ${if} $1 == "" + EnumRegKey $1 HKLM "Software\GPL Ghostscript" 0 + StrCpy $2 "True" + ${endif} ${if} $1 != "" + ${if} $2 == "True" + StrCpy $0 "Software\GPL Ghostscript\$1" + ${else} StrCpy $0 "Software\AFPL Ghostscript\$1" + ${endif} ${else} StrCpy $0 "" ${endif} @@ -536,8 +544,16 @@ Function DownloadGhostscript ; Find which version of ghostscript, if any, is installed. EnumRegKey $1 HKLM "Software\AFPL Ghostscript" 0 + ${if} $1 == "" + EnumRegKey $1 HKLM "Software\GPL Ghostscript" 0 + StrCpy $2 "True" + ${endif} ${if} $1 != "" + ${if} $2 == "True" + StrCpy $0 "Software\GPL Ghostscript\$1" + ${else} StrCpy $0 "Software\AFPL Ghostscript\$1" + ${endif} ${else} StrCpy $0 "" ${endif}