Bug 588386 - Make DMG INNER_UNMAKE_PACKAGE nest in other commands properly, r=bsmedberg a=blocking2.0
authorMichael Wu <mwu@mozilla.com>
Wed, 18 Aug 2010 12:56:46 -0700
changeset 50833 dbcc6e6e2d670b29b81107df2247e085e82a31ff
parent 50832 32d403bf5a7a30a8aea96df3970fbf4355c61a35
child 50834 b6ffda71024d95d1ba367f41ff68e3d77cde178a
push id15171
push usermwu@mozilla.com
push dateWed, 18 Aug 2010 21:01:40 +0000
treeherdermozilla-central@dbcc6e6e2d67 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg, blocking2
bugs588386
milestone2.0b5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 588386 - Make DMG INNER_UNMAKE_PACKAGE nest in other commands properly, r=bsmedberg a=blocking2.0
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -198,18 +198,17 @@ INNER_UNMAKE_PACKAGE	= \
   test -n "$(MOZ_PKG_MAC_ICON)" && \
     rsync -a "$(_ABS_DIST)/unpack.tmp/.VolumeIcon.icns" "$(MOZ_PKG_MAC_ICON)"; \
   rm -rf $(_ABS_DIST)/unpack.tmp; \
   if test -n "$(MOZ_PKG_MAC_RSRC)" ; then \
     cp $(UNPACKAGE) $(MOZ_PKG_APPNAME).tmp.dmg && \
     hdiutil unflatten $(MOZ_PKG_APPNAME).tmp.dmg && \
     { /Developer/Tools/DeRez -skip plst -skip blkx $(MOZ_PKG_APPNAME).tmp.dmg > "$(MOZ_PKG_MAC_RSRC)" || { rm -f $(MOZ_PKG_APPNAME).tmp.dmg && false; }; } && \
     rm -f $(MOZ_PKG_APPNAME).tmp.dmg; \
-  fi; \
-  $(NULL)
+  fi
 # The plst and blkx resources are skipped because they belong to each
 # individual dmg and are created by hdiutil.
 SDK_SUFFIX = .tar.bz2
 SDK = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).$(AB_CD).mac-$(TARGET_CPU).sdk$(SDK_SUFFIX)
 ifeq ($(MOZ_APP_NAME),xulrunner)
 SDK = $(SDK_PATH)$(MOZ_APP_NAME)-$(MOZ_PKG_VERSION).$(AB_CD).mac-$(TARGET_CPU).sdk$(SDK_SUFFIX)
 endif
 MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > $(SDK)