Bug 1429664: Sync windows installer makefile with upstream; r=me

Differential Revision: https://phabricator.services.mozilla.com/D377

--HG--
extra : rebase_source : ee071f6571db66d78c02f9d62175227106338b75
extra : amend_source : 8aae410893c5bb5f6a20e8bd23709c5e2d4be28f
extra : histedit_source : 933a3c3339908ee3441ec3888346c6acb1c700b2

mail/installer/windows/Makefile.in

@@ -65,7 +65,8 @@ installer::
 # For building the uninstaller during the application build so it can be
 # included for mar file generation.
 uninstaller::
-	$(RM) -r $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
+	$(RM) -r $(CONFIG_DIR)
+	$(MKDIR) $(CONFIG_DIR)
 	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
 	$(INSTALL) $(addprefix $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/,$(BRANDING_FILES)) $(CONFIG_DIR)
 	$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
@@ -96,5 +97,7 @@ $(CONFIG_DIR)/setup.exe::
 	  --preprocess-locale $(moztopsrcdir) \
 	  $(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
 
+GARBARGE_DIRS += instgen
+
 include $(moztopsrcdir)/config/rules.mk
 include $(moztopsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk