1 --- mozilla/mozilla/toolkit/mozapps/installer/packager.mk.orig 2012-03-13 03:43:47.000000000 +0100
2 +++ mozilla/mozilla/toolkit/mozapps/installer/packager.mk 2012-03-24 21:50:54.171788606 +0100
6 stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack
7 - @rm -rf $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
8 + @rm -rf $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
9 ifndef MOZ_FAST_PACKAGE
10 - @rm -rf $(DIST)/$(MOZ_PKG_DIR)
11 + @rm -rf $(DESTDIR)/$(MOZ_PKG_DIR)
13 # NOTE: this must be a tar now that dist links into the tree so that we
14 # do not strip the binaries actually in the tree.
15 @echo "Creating package directory..."
16 - if ! test -d $(DIST)/$(MOZ_PKG_DIR) ; then \
17 - mkdir $(DIST)/$(MOZ_PKG_DIR); \
18 + if ! test -d $(DESTDIR)/$(MOZ_PKG_DIR) ; then \
19 + mkdir $(DESTDIR)/$(MOZ_PKG_DIR); \
21 ifndef UNIVERSAL_BINARY
22 # If UNIVERSAL_BINARY, the package will be made from an already-prepared
24 ifdef MOZ_PKG_MANIFEST
25 ifndef MOZ_FAST_PACKAGE
26 $(RM) -rf $(DIST)/xpt $(DIST)/manifests
28 $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
29 - "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
30 + "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \
31 "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
32 - $(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
33 + $(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
34 $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
35 - $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
36 + $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
37 $(patsubst %,$(DIST)/manifests/%/components,$(MOZ_NONLOCALIZED_PKG_LIST))
38 $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
39 - $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \
40 + $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \
41 $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_NONLOCALIZED_PKG_LIST))
42 $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
43 - $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
44 + $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
45 $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_LOCALIZED_PKG_LIST))
46 ifdef MOZ_WEBAPP_RUNTIME
47 - mv $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest
48 - sed 's/$(AB_CD)/localized/' $(DIST)/bin/webapprt/chrome.manifest > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest
49 + mv $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest
50 + sed 's/$(AB_CD)/localized/' $(DESTDIR)/bin/webapprt/chrome.manifest > $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest
52 - printf "manifest components/interfaces.manifest\nmanifest components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest chrome/localized.manifest\n" > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
53 + printf "manifest components/interfaces.manifest\nmanifest components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest chrome/localized.manifest\n" > $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
54 else # !MOZ_PKG_MANIFEST
55 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
58 @$(NSINSTALL) -D $(DIST)/xpt
59 @($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && rm -f $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && cp $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components && printf "interfaces $(MOZ_PKG_APPNAME).xpt\n" >$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/interfaces.manifest) || echo No *.xpt files found in: $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/. Continuing...
61 - @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
62 + cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR)
65 - @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
66 + cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR)
67 @echo "Linking XPT files..."
69 @$(NSINSTALL) -D $(DIST)/xpt
72 endif # MOZ_PKG_MANIFEST
73 endif # UNIVERSAL_BINARY
74 - $(OPTIMIZE_JARS_CMD) --optimize $(JARLOG_DIR_AB_CD) $(DIST)/bin/chrome $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/chrome
75 + $(OPTIMIZE_JARS_CMD) --optimize $(JARLOG_DIR_AB_CD) $(DIST)/bin/chrome $(DESTDIR)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/chrome
78 @echo "Stripping package directory..."
80 cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
82 $(NSINSTALL) -D $(DESTDIR)$(installdir)
83 - (cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
84 + (cd $(DESTDIR)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
85 (cd $(DESTDIR)$(installdir) && tar -xf -)
86 $(NSINSTALL) -D $(DESTDIR)$(bindir)
87 $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
88 --- comm-1.9.1/mail/app/Makefile.in.orig 2009-12-18 14:49:43.990647725 +0100
89 +++ comm-1.9.1/mail/app/Makefile.in 2009-12-18 14:49:53.830739781 +0100
93 -DAPP_VERSION="$(MOZ_APP_VERSION)" \
94 - -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" \
95 + -DTHUNDERBIRD_ICO=\"$(DIST)/branding/$(MOZ_APP_NAME).ico\" \
96 -DGRE_MILESTONE=$(GRE_MILESTONE) \
97 -DGRE_BUILDID=$(GRE_BUILDID) \