Bug 1436662: Fix Thunderbird support for building windows packages; r=mshal

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

--HG--
extra : rebase_source : 670372873da0348a5cf6fda1cda2c21727cab247
extra : source : 40ab7755970c09f7f2c5a729b1ac5fae6fa3e4ba

toolkit/mozapps/installer/windows/nsis/makensis.mk

@@ -59,9 +59,9 @@ installer:: $(CONFIG_DIR)/setup.exe $(ZIP_IN)
 	$(NSINSTALL) -D '$(ABS_DIST)/$(PKG_INST_PATH)'
 	$(MOZILLA_DIR)/mach repackage installer \
 	  -o '$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe' \
-	  --package-name firefox \
+	  --package-name '$(MOZ_PKG_DIR)' \
 	  --package '$(ZIP_IN)' \
-	  --tag $(topsrcdir)/browser/installer/windows/app.tag \
+	  --tag $(topsrcdir)/$(MOZ_BUILD_APP)/installer/windows/app.tag \
 	  --setupexe $(CONFIG_DIR)/setup.exe \
 	  --sfx-stub $(SFX_MODULE)
 ifdef MOZ_EXTERNAL_SIGNING_FORMAT