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

[Julien Nabet (via logerrit)]

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

New commits:
commit b2afcba258d8fc9dc8e0ccafc024d7cce03425bb
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Mon Nov 25 20:06:01 2019 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Thu Dec 5 11:07:38 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.
    
    Reviewed-on: https://gerrit.libreoffice.org/83710
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit be2a605af8c39dc4e655f7ba5702abebd608bf0d)
    Reviewed-on: https://gerrit.libreoffice.org/84036
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Signed-off-by: Xisco Fauli <xiscofauli at libreoffice.org>
    
    Change-Id: I85822b58b12f2f2ea5233426791ed73698e67276
    Reviewed-on: https://gerrit.libreoffice.org/84136
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index a2560f2e2d74..71a60175f0b0 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -279,8 +279,7 @@ postprocess_FILES_main += \
 	$(call gb_XcuModuleTarget_get_target,connectivity/registry/flat)/org/openoffice/Office/DataAccess/Drivers-flat.xcu \
 	$(call gb_XcuModuleTarget_get_target,connectivity/registry/odbc)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu
 postprocess_DRIVERS += dbase flat odbc
-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