icedove-install.patch

   1 --- comm-1.9.1/mozilla/toolkit/mozapps/installer/packager.mk.orig       2009-12-18 14:28:59.997141166 +0100
   2 +++ comm-1.9.1/mozilla/toolkit/mozapps/installer/packager.mk    2009-12-18 14:32:54.201542762 +0100
   3 @@ -365,7 +365,7 @@
   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 $(DESTDIR)/$(MOZ_PKG_DIR)
   9  ifdef MOZ_PKG_MANIFEST
  10         $(RM) -rf $(DIST)/xpt
  11         $(call PACKAGER_COPY, "$(DIST)",\
  12 @@ -384,7 +384,7 @@
  13  endif
  14  endif
  15  else
  16 -       @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
  17 +       cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
  18  endif # DMG
  19  endif # MOZ_PKG_MANIFEST
  20  ifndef PKG_SKIP_STRIP
  21 @@ -416,7 +416,7 @@
  22  endif
  23         @echo "Removing unpackaged files..."
  24  ifdef NO_PKG_FILES
  25 -       cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
  26 +       cd $(DESTDIR)$(MOZ_PKG_APPDIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
  27  endif
  28  ifdef MOZ_PKG_REMOVALS
  29         $(SYSINSTALL) $(IFLAGS1) $(MOZ_PKG_REMOVALS_GEN) $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)
  30 --- comm-1.9.1/mail/app/Makefile.in.orig        2009-12-18 14:49:43.990647725 +0100
  31 +++ comm-1.9.1/mail/app/Makefile.in     2009-12-18 14:49:53.830739781 +0100
  32 @@ -48,7 +48,7 @@
  33  GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
  34
  35  DEFINES += \
  36 -  -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" \
  37 +  -DTHUNDERBIRD_ICO=\"$(DIST)/branding/$(MOZ_APP_NAME).ico\" -DAB_CD=$(AB_CD) \
  38    -DAB_CD=$(AB_CD) \
  39    -DGRE_MILESTONE=$(GRE_MILESTONE) \
  40    -DGRE_BUILDID=$(GRE_BUILDID) \
  41 @@ -80,9 +80,9 @@
  42      $(NULL)
  43
  44  ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
  45 -PROGRAM = thunderbird$(BIN_SUFFIX)
  46 +PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
  47  else
  48 -PROGRAM = thunderbird-bin$(BIN_SUFFIX)
  49 +PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
  50  endif
  51
  52  REQUIRES = \
  53 @@ -311,18 +311,18 @@
  54  endif
  55
  56  ifneq (,$(filter-out OS2 WINNT Darwin,$(OS_ARCH)))
  57 -thunderbird:: $(topsrcdir)/mozilla/build/unix/mozilla.in $(GLOBAL_DEPS) $(DEPTH)/config/autoconf.mk
  58 +$(MOZ_APP_NAME):: $(topsrcdir)/mozilla/build/unix/mozilla.in $(GLOBAL_DEPS) $(DEPTH)/config/autoconf.mk
  59         cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
  60                 -e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" > $@
  61         chmod +x $@
  62
  63 -libs:: thunderbird
  64 +libs:: $(MOZ_APP_NAME)
  65         $(INSTALL) $< $(DIST)/bin
  66
  67 -install:: thunderbird
  68 +install:: $(MOZ_APP_NAME)
  69         $(SYSINSTALL) $< $(DESTDIR)$(bindir)
  70
  71 -GARBAGE += thunderbird
  72 +GARBAGE += $(MOZ_APP_NAME)
  73  GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js all-thunderbird.js channel-prefs.js mailnews.js)
  74  endif
  75
  76 @@ -359,7 +359,7 @@
  77  endif
  78         mkdir -p $(DIST)/$(APP_NAME).app/Contents/Library/Spotlight
  79         rsync -a --copy-unsafe-links $(DIST)/package/Thunderbird.mdimporter $(DIST)/$(APP_NAME).app/Contents/Library/Spotlight
  80 -       cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/$(APP_NAME).app/Contents/Resources/thunderbird.icns
  81 +       cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/branding/$(MOZ_APP_NAME).icns
  82         printf APPLMOZM > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
  83  #       remove CVS dirs from packaged app
  84         find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \;