Bug 551182 - Backport fixes from Firefox package-compare review, r=Standard8
authorPhil Ringnalda <philringnalda@gmail.com>
Tue, 09 Mar 2010 09:37:53 -0800
changeset 5284 c5d261e9a5329d0775eec90b181c68f6e28e296f
parent 5283 0a7b207c903023fc70b8f3b4fb7405b6601e03ef
child 5285 da835c2b8de2631eb8fde151c3a746cd41669699
push idunknown
push userunknown
push dateunknown
reviewersStandard8
bugs551182
Bug 551182 - Backport fixes from Firefox package-compare review, r=Standard8
mail/installer/Makefile.in
suite/installer/Makefile.in
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -125,19 +125,20 @@ else
 PKGCOMP_FIND_OPTS = -L
 endif
 ifeq (Darwin, $(OS_ARCH))
 FINDPATH = $(_APPNAME)/Contents/MacOS
 else
 FINDPATH=bin
 endif
 
-package-compare::
+package-compare:: $(MOZ_PKG_MANIFEST)
 ifdef MOZ_PKG_MANIFEST_P
 	cd $(DIST); find $(PKGCOMP_FIND_OPTS) $(FINDPATH) -type f | sort > bin-list.txt
 	grep "^$(BINPATH)" $(MOZ_PKG_MANIFEST) | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt
 	-diff -u $(DIST)/pack-list.txt $(DIST)/bin-list.txt
+	rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt
 endif
 
 installer: removed-files
 ifdef INSTALLER_DIR
 	$(MAKE) -C $(INSTALLER_DIR)
 endif
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -139,19 +139,20 @@ else
 PKGCOMP_FIND_OPTS = -L
 endif
 ifeq (Darwin, $(OS_ARCH))
 FINDPATH = $(_APPNAME)/Contents/MacOS
 else
 FINDPATH=bin
 endif
 
-package-compare::
+package-compare:: $(MOZ_PKG_MANIFEST)
 ifdef MOZ_PKG_MANIFEST_P
 	cd $(DIST); find $(PKGCOMP_FIND_OPTS) $(FINDPATH) -type f | sort > bin-list.txt
 	grep "^$(BINPATH)" $(MOZ_PKG_MANIFEST) | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt
 	-diff -u $(DIST)/pack-list.txt $(DIST)/bin-list.txt
+	rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt
 endif
 
 installer: removed-files
 ifdef INSTALLER_DIR
 	$(MAKE) -C $(INSTALLER_DIR)
 endif