postprocess/CustomTarget_registry.mk | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
New commits:
commit 61e8d865fd2f3de9668c3176747362e4aaf0054e
Author: David Ostrovsky <da...@ostrovsky.org>
Date: Sat Mar 2 18:46:26 2013 +0100
respect DBCONNECTIVITY option for shipping mork driver
Change-Id: If91a3fa6ad8bd1e359e472efacad9d3051cde17c
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index f2c798d..b88e4ef 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -63,6 +63,15 @@ ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
postprocess_FILES_calc += \
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-calc.xcu
postprocess_DRIVERS += calc
+ifeq (WNT,$(OS))
+ifeq ($(WITH_MOZAB4WIN),YES)
+postprocess_FILES_main +=
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
+postprocess_DRIVERS += mozab
+endif
+else ifeq (DESKTOP,$(filter DESKTOP,$(BUILD_TYPE)))
+postprocess_FILES_main +=
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mork.xcu
+postprocess_DRIVERS += mork
+endif
endif
postprocess_DEPS_cjk := main
@@ -339,16 +348,6 @@ postprocess_FILES_main +=
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Dr
postprocess_DRIVERS += kab
endif
-ifeq (WNT,$(OS))
-ifeq ($(WITH_MOZAB4WIN),YES)
-postprocess_FILES_main +=
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
-postprocess_DRIVERS += mozab
-endif
-else ifeq (DESKTOP,$(filter DESKTOP,$(BUILD_TYPE)))
-postprocess_FILES_main +=
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mork.xcu
-postprocess_DRIVERS += mork
-endif
-
ifneq (,$(SYSTEM_LIBEXTTEXTCAT_DATA))
postprocess_FILES_main +=
$(postprocess_MOD)/org/openoffice/Office/Paths-externallibexttextcatdata.xcu
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
