[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - postprocess/CustomTarget_registry.mk

[Julien Nabet (via logerrit)]

 postprocess/CustomTarget_registry.mk |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 6f06f02cd89468c5e5bd7042e891ac9c08f46ed9
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Mon Nov 25 20:06:01 2019 +0100
Commit:     Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Sat Nov 30 19:12:10 2019 +0100

    tdf#128974: TB Addressbook not available directly as existing database (Win)
    
    When Seamonkey has been removed with:
    
https://cgit.freedesktop.org/libreoffice/core/commit/?id=4e3086da3e9873f53b5b9e1d5e511f9f77aaf62f
    "Remove Seamonkey based address book driver"
    
    mork driver was erroneously skipped.
    
    Change-Id: I85822b58b12f2f2ea5233426791ed73698e67276
    Reviewed-on: https://gerrit.libreoffice.org/83710
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
    Tested-by: Julien Nabet <serval2...@yahoo.fr>
    (cherry picked from commit be2a605af8c39dc4e655f7ba5702abebd608bf0d)
    Reviewed-on: https://gerrit.libreoffice.org/84036
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 579c608cf7fb..c33417c6b2a7 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -280,8 +280,7 @@ postprocess_FILES_main += \
        $(call 
gb_XcuModuleTarget_get_target,connectivity/registry/odbc)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu
 \
        $(call 
gb_XcuModuleTarget_get_target,connectivity/registry/mysql_jdbc)/org/openoffice/Office/DataAccess/Drivers-mysql_jdbc.xcu
 postprocess_DRIVERS += dbase flat odbc mysql_jdbc
-ifeq (WNT,$(OS))
-else ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 postprocess_FILES_main += $(call 
gb_XcuModuleTarget_get_target,connectivity/registry/mork)/org/openoffice/Office/DataAccess/Drivers-mork.xcu
 postprocess_DRIVERS += mork
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits