Bug 501574 - echo -n isn't portable (expecially not to 10.5.x) so we get bogus creator codes, r=Standard8
--- a/calendar/sunbird/app/Makefile.in
+++ b/calendar/sunbird/app/Makefile.in
@@ -383,17 +383,17 @@ libs repackage:: $(PROGRAM)
rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/MacOS
rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS/mangle $(DIST)/$(APP_NAME).app/Contents/MacOS/shlibsign
rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
mkdir -p $(DIST)/$(APP_NAME).app/Contents/Plug-Ins
rsync -a --copy-unsafe-links $(DIST)/package/PrintPDE.plugin $(DIST)/$(APP_NAME).app/Contents/Plug-Ins
-cp -L $(DIST)/bin/mangle $(DIST)/bin/shlibsign $(DIST)/$(APP_NAME).app/Contents/MacOS
cp -RL $(DIST)/branding/sunbird.icns $(DIST)/$(APP_NAME).app/Contents/Resources/sunbird.icns
cp -RL $(DIST)/branding/sb_ICS.icns $(DIST)/$(APP_NAME).app/Contents/Resources/sb_ICS.icns
- echo -n APPL$(MAC_CREATOR_CODE) > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
+ printf APPL$(MAC_CREATOR_CODE) > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
# remove CVS dirs from packaged app
find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \;
endif
endif # LIBXUL_SDK
libs::
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -373,17 +373,17 @@ libs:: $(PROGRAM)
rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/MacOS
rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
mkdir -p $(DIST)/$(APP_NAME).app/Contents/Plug-Ins
rsync -a --copy-unsafe-links $(DIST)/package/PrintPDE.plugin $(DIST)/$(APP_NAME).app/Contents/Plug-Ins
mkdir -p $(DIST)/$(APP_NAME).app/Contents/Library/Spotlight
rsync -a --copy-unsafe-links $(DIST)/package/Thunderbird.mdimporter $(DIST)/$(APP_NAME).app/Contents/Library/Spotlight
cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/$(APP_NAME).app/Contents/Resources/thunderbird.icns
- echo -n APPLMOZM > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
+ printf APPLMOZM > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
# remove CVS dirs from packaged app
find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \;
clean clobber::
rm -rf $(DIST)/$(APP_NAME).app
endif
# Note that anything you do to dist/ down here isn't going to make it into the
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -301,17 +301,17 @@ libs:: $(PROGRAM)
sed -e "s/\@MOZ_APP_NAME\@/$(MOZ_APP_NAME)/" -e "s/\@MOZ_APP_DISPLAYNAME\@/$(MOZ_APP_DISPLAYNAME)/" -e "s/\@MOZ_APP_VERSION\@/$(MOZ_APP_VERSION)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj/InfoPlist.strings
rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/MacOS
rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
mkdir -p $(DIST)/$(APP_NAME).app/Contents/Plug-Ins
rsync -a --copy-unsafe-links $(DIST)/package/PrintPDE.plugin $(DIST)/$(APP_NAME).app/Contents/Plug-Ins
cp -RL $(srcdir)/../branding/icons/mac/*.icns $(DIST)/$(APP_NAME).app/Contents/Resources/
cp -RL $(DIST)/package/mozillaSuite.rsrc $(DIST)/$(APP_NAME).app/Contents/Resources/$(PROGRAM).rsrc
- echo -n APPLMOZZ > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
+ printf APPLMOZZ > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
# remove CVS dirs from packaged app
find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \;
clean clobber::
rm -rf $(DIST)/$(APP_NAME).app
endif
# Anything below the above ifdef won't be included in mac builds. So be very