---- mozilla/toolkit/mozapps/installer/packager.mk~ 2006-12-28 22:23:47.000000000 +0200
-+++ mozilla/toolkit/mozapps/installer/packager.mk 2007-02-26 15:31:13.000000000 +0200
-@@ -307,7 +307,7 @@
+--- ./mozilla/toolkit/mozapps/installer/packager.mk.orig 2011-03-19 00:34:12.000000000 +0100
++++ ./mozilla/toolkit/mozapps/installer/packager.mk 2011-03-22 23:53:43.877485659 +0100
+@@ -496,30 +496,30 @@
+ endif
+
+ stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack
+- @rm -rf $(DIST)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
++ @rm -rf $(DESTDIR)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
# NOTE: this must be a tar now that dist links into the tree so that we
# do not strip the binaries actually in the tree.
@echo "Creating package directory..."
-- @mkdir $(DIST)/$(MOZ_PKG_APPNAME)
-+ @mkdir $(DESTDIR)$(MOZ_PKG_APPDIR)
+- @mkdir $(DIST)/$(MOZ_PKG_DIR)
++ @mkdir -p $(DESTDIR)/$(MOZ_PKG_DIR)
+ ifndef UNIVERSAL_BINARY
+ # If UNIVERSAL_BINARY, the package will be made from an already-prepared
+ # STAGEPATH
ifdef MOZ_PKG_MANIFEST
- $(RM) -rf $(DIST)/xpt
- $(call PACKAGER_COPY, "$(DIST)",\
-@@ -322,7 +322,7 @@
- @cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_APPNAME)
- endif
+ $(RM) -rf $(DIST)/xpt $(DIST)/manifests
+ $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
+- "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
++ "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \
+ "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
+- $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
++ $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
+ $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
+- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
++ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
+ $(patsubst %,$(DIST)/manifests/%/components,$(MOZ_NONLOCALIZED_PKG_LIST))
+ $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
+- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \
++ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \
+ $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_NONLOCALIZED_PKG_LIST))
+ $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
+- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
++ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
+ $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_LOCALIZED_PKG_LIST))
+- 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
++ 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
+ else # !MOZ_PKG_MANIFEST
+ ifeq ($(MOZ_PKG_FORMAT),DMG)
+ ifndef STAGE_SDK
+@@ -529,10 +529,10 @@
+ @$(NSINSTALL) -D $(DIST)/xpt
+ @($(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...
else
-- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_APPNAME); tar -xf -)
-+ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
- endif # DMG
- endif # MOZ_PKG_MANIFEST
- ifndef PKG_SKIP_STRIP
-@@ -354,7 +354,7 @@
- endif
- @echo "Removing unpackaged files..."
- ifdef NO_PKG_FILES
-- cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_BINPATH); rm -rf $(NO_PKG_FILES)
-+ cd $(DESTDIR)$(MOZ_PKG_APPDIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
- endif
- ifdef MOZ_PKG_REMOVALS
- $(SYSINSTALL) $(MOZ_PKG_REMOVALS_GEN) $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_BINPATH)
---- mozilla/mail/app/Makefile.in 2008-06-23 14:04:11.000000000 +0200
-+++ mozilla/mail/app/Makefile.in 2008-06-23 18:42:40.000000000 +0200
-@@ -46,7 +46,7 @@
-
- AB_CD = $(MOZ_UI_LOCALE)
-
--DEFINES += -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" -DAB_CD=$(AB_CD)
-+DEFINES += -DTHUNDERBIRD_ICO=\"$(DIST)/branding/$(MOZ_APP_NAME).ico\" -DAB_CD=$(AB_CD)
-
- DIRS = profile
-
-@@ -60,9 +60,9 @@
+- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
++ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR)
endif
-
- ifeq ($(USE_SHORT_LIBNAME), 1)
--PROGRAM = thunderbird$(BIN_SUFFIX)
-+PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
else
--PROGRAM = thunderbird-bin$(BIN_SUFFIX)
-+PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
- endif
-
- REQUIRES = \
-@@ -243,11 +243,11 @@
- ifndef MOZ_BRANDING_DIRECTORY
- $(NSINSTALL) -D $(DIST)/branding
- ifeq ($(OS_ARCH),WINNT)
-- cp $(srcdir)/thunderbird.ico $(DIST)/branding/thunderbird.ico
-+ cp $(srcdir)/thunderbird.ico $(DIST)/branding/$(MOZ_APP_NAME).ico
- cp $(srcdir)/thunderbird.ico $(DIST)/branding/app.ico
- endif
- ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-- cp $(srcdir)/macbuild/thunderbird.icns $(DIST)/branding/thunderbird.icns
-+ cp $(srcdir)/macbuild/thunderbird.icns $(DIST)/branding/$(MOZ_APP_NAME).icns
- cp $(srcdir)/macbuild/dsstore $(DIST)/branding/dsstore
- cp $(srcdir)/macbuild/background.png $(DIST)/branding/background.png
- cp $(srcdir)/macbuild/disk.icns $(DIST)/branding/disk.icns
-@@ -263,20 +263,20 @@
+- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
++ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR)
+ @echo "Linking XPT files..."
+ @rm -rf $(DIST)/xpt
+ @$(NSINSTALL) -D $(DIST)/xpt
+@@ -620,7 +620,7 @@
+ cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
endif
+ $(NSINSTALL) -D $(DESTDIR)$(installdir)
+- (cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
++ (cd $(DESTDIR)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
+ (cd $(DESTDIR)$(installdir) && tar -xf -)
+ $(NSINSTALL) -D $(DESTDIR)$(bindir)
+ $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
+--- comm-1.9.1/mail/app/Makefile.in.orig 2009-12-18 14:49:43.990647725 +0100
++++ comm-1.9.1/mail/app/Makefile.in 2009-12-18 14:49:53.830739781 +0100
+@@ -48,7 +48,7 @@
+ GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
- ifneq (,$(filter-out OS2 WINNT Darwin,$(OS_ARCH)))
--thunderbird:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
-+$(MOZ_APP_NAME):: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
- cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
-- -e "s|%MOZ_USER_DIR%|.thunderbird|" \
-+ -e "s|%MOZ_USER_DIR%|.$(MOZ_APP_NAME)|" \
- -e "s|%MREDIR%|$(mredir)|" \
- -e "s|%MOZILLA-BIN%|$(PROGRAM)|g" > $@
- chmod +x $@
-
--libs:: thunderbird
-+libs:: $(MOZ_APP_NAME)
- $(INSTALL) $< $(DIST)/bin
-
--install:: thunderbird
-+install:: $(MOZ_APP_NAME)
- $(SYSINSTALL) $< $(DESTDIR)$(bindir)
-
--GARBAGE += thunderbird
-+GARBAGE += $(MOZ_APP_NAME)
- GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js all-thunderbird.js channel-prefs.js mailnews.js)
+ DEFINES += \
+- -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" \
++ -DTHUNDERBIRD_ICO=\"$(DIST)/branding/$(MOZ_APP_NAME).ico\" -DAB_CD=$(AB_CD) \
+ -DAB_CD=$(AB_CD) \
+ -DGRE_MILESTONE=$(GRE_MILESTONE) \
+ -DGRE_BUILDID=$(GRE_BUILDID) \
+@@ -359,7 +359,7 @@
endif
-
-@@ -322,7 +322,7 @@
- # go away once that bug has been closed for a while.
- rm -rf $(DIST)/$(APP_NAME).app/Contents/Plug-Ins/PrintPDE.plugin
- 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
-+ cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/$(APP_NAME).app/Contents/Resources/$(MOZ_APP_NAME).icns
- cp -RL $(srcdir)/macbuild/mail-biff-badge.png $(DIST)/$(APP_NAME).app/Contents/Resources/mail-biff-badge.png
- echo -n APPLMOZM > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
++ cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/branding/$(MOZ_APP_NAME).icns
+ 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 {} \;
projects / packages / icedove.git / blobdiff