Bug 631006 - make-package (make-sourcestamp-file) broken when using MOZ_PKG_PRETTYNAMES=1; r=bsmedberg a=gavin/bustage
authorGavin Sharp <gavin.sharp@gmail.com>
Wed, 02 Feb 2011 13:25:00 -0500
changeset 61817 a6efb78078966b277c3a48824d8a0055c0e8e2e5
parent 61816 8a376e2a54009434f02c6574b875144757c5c642
child 61818 7f80cd5abf478daa50394bb3ffd525f77114348f
push id1
push userroot
push dateTue, 10 Dec 2013 15:46:25 +0000
reviewersbsmedberg, gavin, bustage
bugs631006
milestone2.0b12pre
Bug 631006 - make-package (make-sourcestamp-file) broken when using MOZ_PKG_PRETTYNAMES=1; r=bsmedberg a=gavin/bustage
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -590,20 +590,20 @@ ifdef NO_PKG_FILES
 	cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
 endif
 ifdef MOZ_PKG_REMOVALS
 	$(SYSINSTALL) $(IFLAGS1) $(MOZ_PKG_REMOVALS_GEN) $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)
 endif # MOZ_PKG_REMOVALS
 
 make-package: stage-package $(PACKAGE_XULRUNNER) make-sourcestamp-file
 	@echo "Compressing..."
-	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
 	cd $(DIST) && $(MAKE_PACKAGE)
 
 make-sourcestamp-file::
+	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
 	@echo "$(BUILDID)" > $(MOZ_SOURCESTAMP_FILE)
 	@echo "$(MOZ_SOURCE_REPO)/rev/$(MOZ_SOURCE_STAMP)" >> $(MOZ_SOURCESTAMP_FILE)
 
 # The install target will install the application to prefix/lib/appname-version
 # In addition if INSTALL_SDK is set, it will install the development headers,
 # libraries, and IDL files as follows:
 # dist/include -> prefix/include/appname-version
 # dist/idl -> prefix/share/idl/appname-version