From 07d303b74108debc9e2b9855a49d69bf156a91a9 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 31 Oct 2022 13:30:27 +0200 Subject: [PATCH] Match conditionals in dictionaries/Module_dictionaries.mk Change-Id: Ia80af0e949c160718cf815630d383bf7c36e5b00 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142071 Tested-by: Jenkins Reviewed-by: Andras Timar --- scp2/InstallModule_ooo.mk | 1 + scp2/source/ooo/file_ooo.scp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 8739b86cfdf9..9a6f3eb4cb46 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -23,6 +23,7 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_MACOSX_SANDBOX \ ENABLE_ONLINE_UPDATE \ + MPL_SUBSET \ SYSTEM_CURL \ SYSTEM_HSQLDB \ SYSTEM_LIBXSLT \ diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index dc85a8b0154c..d6e424629536 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -383,7 +383,7 @@ File gid_File_Extension_Dictionary_Da End #endif -#if defined WITH_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS && !defined MPL_SUBSET File gid_File_Extension_Dictionary_De Dir = FILELIST_DIR; Name = "Dictionary/dict-de.filelist"; @@ -392,7 +392,7 @@ File gid_File_Extension_Dictionary_De End #endif -#if defined WITH_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS && !defined MPL_SUBSET File gid_File_Extension_Dictionary_En Dir = FILELIST_DIR; Name = "Dictionary/dict-en.filelist"; @@ -536,7 +536,7 @@ File gid_File_Extension_Dictionary_Is End #endif -#if defined WITH_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS && !defined MPL_SUBSET File gid_File_Extension_Dictionary_It Dir = FILELIST_DIR; Name = "Dictionary/dict-it.filelist";