From 9b8a038343bb0f567b2dd46382d57e68bb9ff150 Mon Sep 17 00:00:00 2001 From: Tamas Bunth Date: Mon, 27 Aug 2018 10:21:32 +0200 Subject: mysqlc: fix registry configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iefe1446e5f28471c6cafd256b29612c2457e42fc Reviewed-on: https://gerrit.libreoffice.org/59640 Tested-by: Jenkins Reviewed-by: Tamás Bunth Reviewed-on: https://gerrit.libreoffice.org/59715 Reviewed-by: Andras Timar Tested-by: Andras Timar --- postprocess/CustomTarget_registry.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'postprocess') diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index dc58f0657dce..360b9eedcb9f 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -280,9 +280,8 @@ ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) postprocess_FILES_main += \ $(call gb_XcuModuleTarget_get_target,connectivity/registry/dbase)/org/openoffice/Office/DataAccess/Drivers-dbase.xcu \ $(call gb_XcuModuleTarget_get_target,connectivity/registry/flat)/org/openoffice/Office/DataAccess/Drivers-flat.xcu \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/mysqlc)/org/openoffice/Office/DataAccess/Drivers-mysql.xcu \ $(call gb_XcuModuleTarget_get_target,connectivity/registry/odbc)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu -postprocess_DRIVERS += dbase flat mysqlc odbc +postprocess_DRIVERS += dbase flat odbc ifeq (WNT,$(OS)) else ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) @@ -344,6 +343,12 @@ postprocess_FILES_main += \ postprocess_DRIVERS += firebird_sdbc endif +ifeq ($(ENABLE_MARIADBC),TRUE) +postprocess_FILES_main += \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/mysqlc)/org/openoffice/Office/DataAccess/Drivers-mysqlc.xcu +postprocess_DRIVERS += mysqlc +endif + ifneq (,$(SYSTEM_LIBEXTTEXTCAT_DATA)) postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/Paths-externallibexttextcatdata.xcu else -- cgit