split-evoab

Gbp-Pq: Name split-evoab.diff

diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index a5b520992786c4b9e9a9b7c062332f403e73b763..ce4b6597d0955a2515448a527d7362bc7bd79640 100644 (file)
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -324,8 +324,9 @@ ifneq ($(WITH_WEBDAV),)
 postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-webdav.xcu
 endif
 ifeq ($(ENABLE_EVOAB2),TRUE)
-postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
-postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
+postprocess_XCDS += evoab.xcd
+postprocess_FILES_evoab += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
+postprocess_FILES_evoab += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
 postprocess_DRIVERS += evoab
 endif
 ifeq ($(ENABLE_JAVA),TRUE)

diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk
index c33f4f52d67b16758c97633334843af956c1b451..8f06c0273effef2f96c2a99b8a50fb0761b00abc 100644 (file)
--- a/scp2/InstallModule_gnome.mk
+++ b/scp2/InstallModule_gnome.mk
@@ -19,4 +19,8 @@ $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/gnome,\
     scp2/source/gnome/module_gnome \
 ))
 
+$(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
+    ENABLE_EVOAB2 \
+))
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:

diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index 3f4b8f55810b3a512956bc98f13dc4f80a89a36f..25d068f3a2b3cdab4809ff5377dddc39a18ee380 100644 (file)
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -26,3 +26,13 @@ File gid_File_Share_Registry_Gnome_Xcd
     Name = "gnome.xcd";
 End
 #endif
+
+#ifdef ENABLE_EVOAB2
+File gid_File_Share_Registry_Evoab_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "evoab.xcd";
+End
+#endif
+

diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index 200c30049d7f03403ac57f77aa907510be1e1a46..48250752fe4a0d72ea34f676651aea2db180a28c 100644 (file)
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -30,6 +30,9 @@ Module gid_Module_Optional_Gnome
     Files = (auto_gnome_ALL
 #if ENABLE_GIO
       ,gid_File_Share_Registry_Gnome_Xcd
+#endif
+#ifdef ENABLE_EVOAB2
+      ,gid_File_Share_Registry_Evoab_Xcd
 #endif
     );
 End