]>
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 | |
19aa9cc1 | 3 | @@ -708,41 +708,41 @@ |
f4114a7f ER |
4 | endif |
5 | ||
6 | stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack | |
03be87a5 JR |
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) | |
12 | endif | |
c49f66d3 | 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..." | |
03be87a5 JR |
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); \ | |
20 | fi | |
f4114a7f ER |
21 | ifndef UNIVERSAL_BINARY |
22 | # If UNIVERSAL_BINARY, the package will be made from an already-prepared | |
23 | # STAGEPATH | |
c49f66d3 | 24 | ifdef MOZ_PKG_MANIFEST |
03be87a5 | 25 | ifndef MOZ_FAST_PACKAGE |
f4114a7f | 26 | $(RM) -rf $(DIST)/xpt $(DIST)/manifests |
03be87a5 | 27 | endif |
7876e8ff | 28 | $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\ |
f4114a7f ER |
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) | |
64b4570d JB |
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)" | |
f4114a7f ER |
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)) | |
19aa9cc1 JR |
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 | |
51 | endif | |
f4114a7f ER |
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 | |
e29fa748 | 54 | else # !MOZ_PKG_MANIFEST |
03be87a5 | 55 | ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
7876e8ff | 56 | ifndef STAGE_SDK |
64b4570d | 57 | @@ -741,10 +741,10 @@ |
f4114a7f ER |
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... | |
7876e8ff | 60 | else |
61 | - @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -) | |
f4114a7f | 62 | + cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR) |
c49f66d3 | 63 | endif |
64 | else | |
a1f0fe0d | 65 | - @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -) |
f4114a7f | 66 | + cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR) |
7876e8ff | 67 | @echo "Linking XPT files..." |
68 | @rm -rf $(DIST)/xpt | |
69 | @$(NSINSTALL) -D $(DIST)/xpt | |
15c05ec4 JR |
70 | @@ -801,7 +801,7 @@ |
71 | endif # DMG | |
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 | |
76 | ifndef PKG_SKIP_STRIP | |
77 | ifeq ($(OS_ARCH),OS2) | |
78 | @echo "Stripping package directory..." | |
64b4570d | 79 | @@ -830,7 +830,7 @@ |
f4114a7f ER |
80 | cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR) |
81 | endif | |
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) | |
a1f0fe0d | 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 | |
90 | @@ -48,7 +48,7 @@ | |
a1f0fe0d | 91 | DEFINES += \ |
a1f0fe0d | 92 | -DAB_CD=$(AB_CD) \ |
37973fb0 JR |
93 | -DAPP_VERSION="$(MOZ_APP_VERSION)" \ |
94 | - -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" \ | |
95 | + -DTHUNDERBIRD_ICO=\"$(DIST)/branding/$(MOZ_APP_NAME).ico\" \ | |
a1f0fe0d | 96 | -DGRE_MILESTONE=$(GRE_MILESTONE) \ |
97 | -DGRE_BUILDID=$(GRE_BUILDID) \ | |
37973fb0 | 98 | $(NULL) |