diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-03-18 17:56:10 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-03-18 22:18:10 +0100 |
| commit | 589d63451c52f7df2e5f5758432f0aa6d7a9b6c5 (patch) | |
| tree | 87d02f7eaf697859280454cee3cd0db99201295d | |
| parent | a8dd38dd4bab84de4525d2e96d11610525d07ffc (diff) | |
scp2: move moz_runtime to AutoInstall
... and why is this not conditional on WITH_MOZAB4WIN but DESKTOP?
Change-Id: I6ba3780eb7472b72d4e1338948bd6ce8dcfff529
| -rw-r--r-- | RepositoryExternal.mk | 8 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 11 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 3 |
3 files changed, 7 insertions, 15 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2a6243b56439..0d1000bec14d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2566,7 +2566,11 @@ endef endif # SYSTEM_POSTGRESQL -ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +ifneq ($(WITH_MOZAB4WIN),) + +$(eval $(call gb_Helper_register_packages_for_install,ooo,\ + moz_runtime \ +)) define gb_LinkTarget__use_mozilla @@ -2646,7 +2650,7 @@ endif # !GCC endef -endif # DESKTOP +endif # WITH_MOZAB4WIN ifeq ($(ENABLE_KDE),TRUE) diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 27719e46caeb..a2a9356aeb65 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -415,17 +415,6 @@ File gid_File_xmloff_dtd Name = "xmloff_dtd.filelist"; End -#if defined WITH_MOZAB4WIN - -File gid_File_Mozilla_Runtime - TXT_FILE_BODY; - Styles = (FILELIST); - Dir = FILELIST_DIR; - Name = "moz_runtime.filelist"; -End - -#endif - File gid_File_Share_Labels_Xml TXT_FILE_BODY; Styles = (FILELIST, PACKED); diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index fad9607af00a..0d91f6ef4726 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -306,8 +306,7 @@ Module gid_Module_Root_Files_7 Sortkey = "1900"; Default = YES; Styles = (HIDDEN_ROOT); - Files = (gid_File_Help_Help_Zip, - gid_File_Mozilla_Runtime); + Files = (gid_File_Help_Help_Zip); End #ifndef LIBO_HEADLESS |