]>
Commit | Line | Data |
---|---|---|
64b4570d JB |
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 | |
37973fb0 | 3 | @@ -708,35 +708,35 @@ |
f4114a7f ER |
4 | endif |
5 | ||
6 | stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack | |
7 | - @rm -rf $(DIST)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST) | |
8 | + @rm -rf $(DESTDIR)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST) | |
c49f66d3 | 9 | # NOTE: this must be a tar now that dist links into the tree so that we |
10 | # do not strip the binaries actually in the tree. | |
11 | @echo "Creating package directory..." | |
a1f0fe0d | 12 | - @mkdir $(DIST)/$(MOZ_PKG_DIR) |
64b4570d | 13 | + @mkdir $(DESTDIR)/$(MOZ_PKG_DIR) |
f4114a7f ER |
14 | ifndef UNIVERSAL_BINARY |
15 | # If UNIVERSAL_BINARY, the package will be made from an already-prepared | |
16 | # STAGEPATH | |
c49f66d3 | 17 | ifdef MOZ_PKG_MANIFEST |
f4114a7f | 18 | $(RM) -rf $(DIST)/xpt $(DIST)/manifests |
7876e8ff | 19 | $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\ |
f4114a7f ER |
20 | - "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \ |
21 | + "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \ | |
22 | "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1) | |
37973fb0 JR |
23 | ifeq (DMG, $(MOZ_PKG_FORMAT)) |
24 | ifeq (dmg, $(filter dmg, $(MOZ_INTERNAL_SIGNING_FORMAT))) | |
25 | - @cd $(DIST)/$(_APPNAME)/Contents && ln -sf _CodeSignature/CodeResources CodeResources | |
26 | + @cd $(DESTDIR)/$(_APPNAME)/Contents && ln -sf _CodeSignature/CodeResources CodeResources | |
27 | endif | |
28 | endif | |
64b4570d JB |
29 | - $(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)" |
30 | + $(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)" | |
f4114a7f ER |
31 | $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \ |
32 | - $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \ | |
33 | + $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \ | |
34 | $(patsubst %,$(DIST)/manifests/%/components,$(MOZ_NONLOCALIZED_PKG_LIST)) | |
35 | $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \ | |
36 | - $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \ | |
37 | + $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \ | |
38 | $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_NONLOCALIZED_PKG_LIST)) | |
39 | $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \ | |
40 | - $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \ | |
41 | + $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \ | |
42 | $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_LOCALIZED_PKG_LIST)) | |
43 | - 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 | |
44 | + 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 | |
e29fa748 ER |
45 | else # !MOZ_PKG_MANIFEST |
46 | ifeq ($(MOZ_PKG_FORMAT),DMG) | |
7876e8ff | 47 | ifndef STAGE_SDK |
64b4570d | 48 | @@ -741,10 +741,10 @@ |
f4114a7f ER |
49 | @$(NSINSTALL) -D $(DIST)/xpt |
50 | @($(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... | |
7876e8ff | 51 | else |
52 | - @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -) | |
f4114a7f | 53 | + cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR) |
c49f66d3 | 54 | endif |
55 | else | |
a1f0fe0d | 56 | - @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -) |
f4114a7f | 57 | + cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR) |
7876e8ff | 58 | @echo "Linking XPT files..." |
59 | @rm -rf $(DIST)/xpt | |
60 | @$(NSINSTALL) -D $(DIST)/xpt | |
64b4570d | 61 | @@ -830,7 +830,7 @@ |
f4114a7f ER |
62 | cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR) |
63 | endif | |
64 | $(NSINSTALL) -D $(DESTDIR)$(installdir) | |
65 | - (cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \ | |
66 | + (cd $(DESTDIR)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \ | |
67 | (cd $(DESTDIR)$(installdir) && tar -xf -) | |
68 | $(NSINSTALL) -D $(DESTDIR)$(bindir) | |
69 | $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME) | |
a1f0fe0d | 70 | --- comm-1.9.1/mail/app/Makefile.in.orig 2009-12-18 14:49:43.990647725 +0100 |
71 | +++ comm-1.9.1/mail/app/Makefile.in 2009-12-18 14:49:53.830739781 +0100 | |
72 | @@ -48,7 +48,7 @@ | |
a1f0fe0d | 73 | DEFINES += \ |
a1f0fe0d | 74 | -DAB_CD=$(AB_CD) \ |
37973fb0 JR |
75 | -DAPP_VERSION="$(MOZ_APP_VERSION)" \ |
76 | - -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" \ | |
77 | + -DTHUNDERBIRD_ICO=\"$(DIST)/branding/$(MOZ_APP_NAME).ico\" \ | |
a1f0fe0d | 78 | -DGRE_MILESTONE=$(GRE_MILESTONE) \ |
79 | -DGRE_BUILDID=$(GRE_BUILDID) \ | |
37973fb0 | 80 | $(NULL) |