diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2016-12-01 14:47:31 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2016-12-01 17:07:54 +0100 |
| commit | 0b66adec8f3a3e03499d5a3cb1db7008a391e61e (patch) | |
| tree | bbce7157571a1cb34a7552f43e55c4c628f95a01 | |
| parent | 39a4ca4072059b707a5368d8d215249e06258032 (diff) | |
tdf#90753: AutoInstall gengal with filelist feature
Change-Id: Ic72fb18eccb54b24f4205d997585cee753965b10
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 11 | ||||
| -rw-r--r-- | scp2/source/ooo/module_ooo.scp | 1 |
3 files changed, 1 insertions, 12 deletions
diff --git a/Repository.mk b/Repository.mk index 33bf6d088633..bcf63d473d84 100644 --- a/Repository.mk +++ b/Repository.mk @@ -845,6 +845,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ package_dtd \ sd_web \ sfx2_emojiconfig \ + $(call gb_Helper_optional,DESKTOP,$(if $(filter-out MACOSX WNT,$(OS)),svx_gengal)) \ $(if $(USING_X11),vcl_fontunxppds) \ $(if $(filter $(OS),MACOSX),vcl_osxres) \ xmloff_dtd \ diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index df88a7154295..a3e5a6728c28 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -27,17 +27,6 @@ #include "macros.inc" -#if defined UNX && !defined MACOSX - -File gid_File_Script_Gengal - BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); - Name = "gengal"; -End - -#endif - #if defined UNX && ! defined ENABLE_MACOSX_SANDBOX File gid_File_Bin_Senddoc BIN_FILE_BODY; diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp index 4287904b77c0..210f4e523109 100644 --- a/scp2/source/ooo/module_ooo.scp +++ b/scp2/source/ooo/module_ooo.scp @@ -24,7 +24,6 @@ Module gid_Module_Root InstallOrder = "20"; MOD_NAME_DESC(MODULE_ROOT_OSL); Files = (gid_File_Bin_Senddoc, - gid_File_Script_Gengal, gid_File_Txt_Pagein_Common, gid_File_Txt_Pagein_Calc, gid_File_Txt_Pagein_Draw, |