Check WITH_MOZAB4WIN

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

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