[Libreoffice-commits] .: Branch 'libreoffice-4-0' - postprocess/packcomponents postprocess/packregistry

[Libreoffice Gerrit user]

 postprocess/packcomponents/makefile.mk |    3 +--
 postprocess/packregistry/makefile.mk   |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 748fd365ea3e6cb2b14f02858c1724559ac87eac
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Dec 5 08:10:03 2012 +0200

    Check WITH_MOZAB4WIN

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index cd9db06..fa3231c 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -337,7 +337,6 @@ my_components += \
     component/dtrans/util/dnd \
     component/dtrans/util/ftransl \
     component/dtrans/util/sysdtrans \
-    component/fpicker/source/odma/fps_odma \
     component/fpicker/source/win32/fps \
     component/shell/source/backends/wininetbe/wininetbe1 \
     component/shell/source/win32/simplemail/smplmail \
@@ -374,7 +373,7 @@ my_components += \
 .END
 
 .IF "$(OS)" == "WNT"
-.IF "$(SYSTEM_MOZILLA)" != "YES" && "$(WITH_MOZILLA)" != "NO"
+.IF "$(WITH_MOZAB4WIN)" == "YES"
 my_components += component/connectivity/source/drivers/mozab/mozab
 .ELSE
 my_components += component/connectivity/source/drivers/mozab/bootstrap/mozbootstrap
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index f353ef2..952c1cc 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -351,7 +351,7 @@ MY_DRIVERS += kab
 .END
 
 .IF "$(OS)" == "WNT"
-.IF "$(SYSTEM_MOZILLA)" != "YES" && "$(WITH_MOZILLA)" != "NO"
+.IF "$(WITH_MOZAB4WIN)" == "YES"
 MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
 MY_DRIVERS += mozab
 .END