Bug 946605 - Fix typo from bug 943728 in packager.mk breaking mac l10n builds. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 06 Dec 2013 08:45:30 +0900
changeset 174713 1401e4b394ad3cd297b59ef1206c7a6842a1c903
parent 174712 394becd1ec49d2e7251097a8d3f2c85f762cff48
child 174789 ca8e76cd1b16a972a61dea41b4d53f3d616ace93
child 174813 497e5afa3a4db7acacf071998e8b25632f79f9cc
child 174867 d591ede1ec531a5c93e57753e73322e4fd474562
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs946605, 943728
milestone28.0a1
first release with
nightly linux32
1401e4b394ad / 28.0a1 / 20131206030202 / files
nightly linux64
1401e4b394ad / 28.0a1 / 20131206030202 / files
nightly mac
1401e4b394ad / 28.0a1 / 20131206030202 / files
nightly win32
1401e4b394ad / 28.0a1 / 20131206030202 / files
nightly win64
1401e4b394ad / 28.0a1 / 20131206030202 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 946605 - Fix typo from bug 943728 in packager.mk breaking mac l10n builds. r=mshal
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -472,17 +472,17 @@ INNER_UNMAKE_PACKAGE	= \
   set -ex; \
   rm -rf $(_ABS_DIST)/unpack.tmp; \
   mkdir -p $(_ABS_DIST)/unpack.tmp; \
   $(_ABS_MOZSRCDIR)/build/package/mac_osx/unpack-diskimage $(UNPACKAGE) /tmp/$(MOZ_PKG_APPNAME)-unpack $(_ABS_DIST)/unpack.tmp; \
   rsync -a '$(_ABS_DIST)/unpack.tmp/$(_APPNAME)' $(MOZ_PKG_DIR); \
   test -n '$(MOZ_PKG_MAC_DSSTORE)' && \
     rsync -a '$(_ABS_DIST)/unpack.tmp/.DS_Store' '$(MOZ_PKG_MAC_DSSTORE)'; \
   test -n '$(MOZ_PKG_MAC_BACKGROUND)' && \
-    rsync -a '$(_ABS_DIST)/unpack.tmp/.background/`basename '$(MOZ_PKG_MAC_BACKGROUND)'`' '$(MOZ_PKG_MAC_BACKGROUND)'; \
+    rsync -a '$(_ABS_DIST)/unpack.tmp/.background/$(notdir $(MOZ_PKG_MAC_BACKGROUND))' '$(MOZ_PKG_MAC_BACKGROUND)'; \
   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; \