connectivity: just check the WITH_MOZAB4WIN variable

Either build mozab or mork driver, and install it in Repository.mk too.

Change-Id: I456d6cb4ebe99625a64a960d1133cb06d836e8c7

Repository.mk

@@ -460,20 +460,19 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	xof \
 	xsltdlg \
 	xsltfilter \
+	$(if $(WITH_MOZAB4WIN), \
+		mozab2 \
+		mozabdrv \
+	) \
+	$(if $(WITH_MOZAB4WIN),,\
+		mork \
+		mozbootstrap \
+	) \
 	$(if $(filter $(OS),WNT), \
 		ado \
 		$(if $(DISABLE_ATL),,oleautobridge) \
 		smplmail \
 		wininetbe1 \
-		$(if $(WITH_MOZAB4WIN), \
-			mozab2 \
-			mozabdrv \
-		) \
-		$(if $(WITH_MOZAB4WIN),,mozbootstrap) \
-	) \
-	$(if $(filter $(OS),WNT),, \
-		mork \
-		mozbootstrap \
 	) \
 	$(if $(filter $(OS),MACOSX), \
 		$(if $(ENABLE_MACOSX_SANDBOX),, \

connectivity/Module_connectivity.mk

@@ -102,19 +102,13 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 ))
 endif
 
-ifeq ($(OS)-$(CPUNAME),WNT-INTEL)
-
 ifneq ($(WITH_MOZAB4WIN),)
+
 $(eval $(call gb_Module_add_targets,connectivity,\
 	Configuration_mozab \
 	Library_mozab \
 	Library_mozabdrv \
 ))
-else
-$(eval $(call gb_Module_add_targets,connectivity,\
-	Library_mozbootstrap \
-))
-endif
 
 else ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))