1 --- ./mozilla/toolkit/mozapps/installer/packager.mk.org 2010-01-21 21:10:00.234466295 +0100
2 +++ ./mozilla/toolkit/mozapps/installer/packager.mk 2010-01-21 21:10:29.847369216 +0100
4 # NOTE: this must be a tar now that dist links into the tree so that we
5 # do not strip the binaries actually in the tree.
6 @echo "Creating package directory..."
7 - @mkdir $(DIST)/$(MOZ_PKG_DIR)
8 + @mkdir -p $(DESTDIR)/$(MOZ_PKG_APPDIR)
11 $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
12 - "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
13 + "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_APPDIR))", \
14 "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
15 - $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
16 + $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_APPDIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
17 else # !MOZ_PKG_MANIFEST
18 ifeq ($(MOZ_PKG_FORMAT),DMG)
19 # If UNIVERSAL_BINARY, the package will be made from an already-prepared
22 @cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_DIR)
24 - @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
25 + cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
29 - @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
30 + cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
31 @echo "Linking XPT files..."
33 @$(NSINSTALL) -D $(DIST)/xpt
34 --- comm-1.9.1/mail/app/Makefile.in.orig 2009-12-18 14:49:43.990647725 +0100
35 +++ comm-1.9.1/mail/app/Makefile.in 2009-12-18 14:49:53.830739781 +0100
37 GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
40 - -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" \
41 + -DTHUNDERBIRD_ICO=\"$(DIST)/branding/$(MOZ_APP_NAME).ico\" -DAB_CD=$(AB_CD) \
43 -DGRE_MILESTONE=$(GRE_MILESTONE) \
44 -DGRE_BUILDID=$(GRE_BUILDID) \
47 mkdir -p $(DIST)/$(APP_NAME).app/Contents/Library/Spotlight
48 rsync -a --copy-unsafe-links $(DIST)/package/Thunderbird.mdimporter $(DIST)/$(APP_NAME).app/Contents/Library/Spotlight
49 - cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/$(APP_NAME).app/Contents/Resources/thunderbird.icns
50 + cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/branding/$(MOZ_APP_NAME).icns
51 printf APPLMOZM > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
52 # remove CVS dirs from packaged app
53 find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \;