* All ImageMagick and Ghostscript resources are no longer installed as separate files...

[lyx.git] / development / Win32 / packaging / installer / include / gui.nsh

diff --git a/development/Win32/packaging/installer/include/gui.nsh b/development/Win32/packaging/installer/include/gui.nsh
index 248ea90587eabf8ec8b99ec11b45b776c2d16f59..4815a74c01878c9da00ea2ec532b64326aff309c 100644 (file)
--- a/development/Win32/packaging/installer/include/gui.nsh
+++ b/development/Win32/packaging/installer/include/gui.nsh
@@ -31,15 +31,19 @@ BrandingText " "
 # Installer\r
 \r
 !define MUI_WELCOMEPAGE_TITLE_3LINES\r
-!define MUI_WELCOMEPAGE_TEXT $(TEXT_WELCOME_${SETUPTYPE_NAME})\r
+!define MUI_WELCOMEPAGE_TEXT $(TEXT_WELCOME)\r
 !insertmacro MUI_PAGE_WELCOME\r
 !insertmacro MUI_PAGE_LICENSE "${FILES_LICENSE}"\r
 !insertmacro MULTIUSER_PAGE_INSTALLMODE\r
 \r
 Page custom PageReinstall PageReinstallValidate\r
 Page custom PageExternalLaTeX PageExternalLaTeXValidate\r
+!ifndef BUNDLE_IMAGEMAGICK\r
 Page custom PageExternalImageMagick PageExternalImageMagickValidate\r
+!endif\r
+!ifndef BUNDLE_GHOSTSCRIPT\r
 Page custom PageExternalGhostscript PageExternalGhostscriptValidate\r
+!endif\r
 Page custom PageLanguage PageLanguageValidate\r
 \r
 !define MUI_PAGE_HEADER_TEXT $(TEXT_DICT_TITLE)\r