* include installer building in zipinstall make target when building for relevant OS targets

Makefile

@@ -514,6 +514,10 @@ UTILS=1
 endif
 endif
 endif
+INSTALLERTARGETS=emx go32v2 msdos os2
+ifneq ($(findstring $(OS_TARGET),$(INSTALLERTARGETS)),)
+INSTALLER=1
+endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_DIRS+=compiler rtl utils packages installer
 endif
@@ -3173,11 +3177,17 @@ endif
 	$(MAKE) packages_clean $(CLEANOPTS)
 ifdef UTILS
 	$(MAKE) utils_clean $(CLEANOPTS)
+endif
+ifdef INSTALLER
+	$(MAKE) installer_clean $(CLEANOPTS)
 endif
 	$(MAKE) rtl_$(ALLTARGET) $(BUILDOPTS)
 	$(MAKE) packages_$(ALLTARGET) $(BUILDOPTS)
 ifdef UTILS
 	$(MAKE) utils_all $(BUILDOPTS)
+endif
+ifdef INSTALLER
+	$(MAKE) installer_all $(BUILDOPTS)
 endif
 	$(ECHOREDIR) Build > $(BUILDSTAMP)
 	$(ECHOREDIR) Build > base.$(BUILDSTAMP)

Makefile.fpc

@@ -231,6 +231,11 @@ endif
 endif
 endif
 
+INSTALLERTARGETS=emx go32v2 msdos os2
+ifneq ($(findstring $(OS_TARGET),$(INSTALLERTARGETS)),)
+INSTALLER=1
+endif
+
 [rules]
 # These values can change
 unexport FPC_VERSION FPC_COMPILERINFO OS_SOURCE
@@ -323,11 +328,17 @@ endif
 ifdef UTILS
         $(MAKE) utils_clean $(CLEANOPTS)
 endif
+ifdef INSTALLER
+        $(MAKE) installer_clean $(CLEANOPTS)
+endif
 # build everything
         $(MAKE) rtl_$(ALLTARGET) $(BUILDOPTS)
         $(MAKE) packages_$(ALLTARGET) $(BUILDOPTS)
 ifdef UTILS
         $(MAKE) utils_all $(BUILDOPTS)
+endif
+ifdef INSTALLER
+        $(MAKE) installer_all $(BUILDOPTS)
 endif
         $(ECHOREDIR) Build > $(BUILDSTAMP)
         $(ECHOREDIR) Build > base.$(BUILDSTAMP)