split-evoab

Gbp-Pq: Name split-evoab.diff

diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 6a9e2d19e457f0d071ff229b71a716fba639a449..23985f9a74d3da8dd633811982034fdf78c93141 100644 (file)
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -329,8 +329,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 ac3a1fd9b0ce2004b3fd0c68f587ec5858179a4d..2fa745feb8979cc30ff22aedb0ff7834d92beacd 100644 (file)
--- a/scp2/InstallModule_gnome.mk
+++ b/scp2/InstallModule_gnome.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/gnome))
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome))
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
+       ENABLE_EVOAB2 \
     ENABLE_GTK \
 ))
 

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 e1c58621f9b19935d033fb7a45667f0d13207093..92b19cf53ef2b6d4ed8dea7859b00f72ad335158 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
       gid_File_Bin_Gnome_Open_Url
     );