icedove-install.patch

   1 --- mozilla/toolkit/mozapps/installer/packager.mk~      2006-12-28 22:23:47.000000000 +0200
   2 +++ mozilla/toolkit/mozapps/installer/packager.mk       2007-02-26 15:31:13.000000000 +0200
   3 @@ -307,7 +307,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_APPNAME)
   8 +       @mkdir $(DESTDIR)$(MOZ_PKG_APPDIR)
   9  ifdef MOZ_PKG_MANIFEST
  10         $(RM) -rf $(DIST)/xpt
  11         $(call PACKAGER_COPY, "$(DIST)",\
  12 @@ -322,7 +322,7 @@
  13         @cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_APPNAME)
  14  endif
  15  else
  16 -       @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_APPNAME); 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 @@ -354,7 +354,7 @@
  22  endif
  23         @echo "Removing unpackaged files..."
  24  ifdef NO_PKG_FILES
  25 -       cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_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) $(MOZ_PKG_REMOVALS_GEN) $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_BINPATH)
  30 --- mozilla/mail/app/Makefile.in        2008-06-23 14:04:11.000000000 +0200
  31 +++ mozilla/mail/app/Makefile.in        2008-06-23 18:42:40.000000000 +0200
  32 @@ -46,7 +46,7 @@
  33
  34  AB_CD = $(MOZ_UI_LOCALE)
  35
  36 -DEFINES += -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" -DAB_CD=$(AB_CD)
  37 +DEFINES += -DTHUNDERBIRD_ICO=\"$(DIST)/branding/$(MOZ_APP_NAME).ico\" -DAB_CD=$(AB_CD)
  38
  39  DIRS           = profile
  40
  41 @@ -60,9 +60,9 @@
  42  endif
  43
  44  ifeq ($(USE_SHORT_LIBNAME), 1)
  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 @@ -243,11 +243,11 @@
  54  ifndef MOZ_BRANDING_DIRECTORY
  55         $(NSINSTALL) -D $(DIST)/branding
  56  ifeq ($(OS_ARCH),WINNT)
  57 -       cp $(srcdir)/thunderbird.ico   $(DIST)/branding/thunderbird.ico
  58 +       cp $(srcdir)/thunderbird.ico   $(DIST)/branding/$(MOZ_APP_NAME).ico
  59         cp $(srcdir)/thunderbird.ico   $(DIST)/branding/app.ico
  60  endif
  61  ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
  62 -       cp $(srcdir)/macbuild/thunderbird.icns  $(DIST)/branding/thunderbird.icns
  63 +       cp $(srcdir)/macbuild/thunderbird.icns  $(DIST)/branding/$(MOZ_APP_NAME).icns
  64         cp $(srcdir)/macbuild/dsstore $(DIST)/branding/dsstore
  65         cp $(srcdir)/macbuild/background.png $(DIST)/branding/background.png
  66         cp $(srcdir)/macbuild/disk.icns $(DIST)/branding/disk.icns
  67 @@ -263,20 +263,20 @@
  68  endif
  69
  70  ifneq (,$(filter-out OS2 WINNT Darwin,$(OS_ARCH)))
  71 -thunderbird:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
  72 +$(MOZ_APP_NAME):: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
  73         cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
  74 -                -e "s|%MOZ_USER_DIR%|.thunderbird|" \
  75 +                -e "s|%MOZ_USER_DIR%|.$(MOZ_APP_NAME)|" \
  76                 -e "s|%MREDIR%|$(mredir)|" \
  77                 -e "s|%MOZILLA-BIN%|$(PROGRAM)|g" > $@
  78         chmod +x $@
  79
  80 -libs:: thunderbird
  81 +libs:: $(MOZ_APP_NAME)
  82         $(INSTALL) $< $(DIST)/bin
  83
  84 -install:: thunderbird
  85 +install:: $(MOZ_APP_NAME)
  86         $(SYSINSTALL) $< $(DESTDIR)$(bindir)
  87
  88 -GARBAGE += thunderbird
  89 +GARBAGE += $(MOZ_APP_NAME)
  90  GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js all-thunderbird.js channel-prefs.js mailnews.js)
  91  endif
  92
  93 @@ -322,7 +322,7 @@
  94  # go away once that bug has been closed for a while.
  95         rm -rf $(DIST)/$(APP_NAME).app/Contents/Plug-Ins/PrintPDE.plugin
  96         rsync -a --copy-unsafe-links $(DIST)/package/PrintPDE.plugin $(DIST)/$(APP_NAME).app/Contents/Plug-Ins
  97 -       cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/$(APP_NAME).app/Contents/Resources/thunderbird.icns
  98 +       cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/$(APP_NAME).app/Contents/Resources/$(MOZ_APP_NAME).icns
  99         cp -RL $(srcdir)/macbuild/mail-biff-badge.png   $(DIST)/$(APP_NAME).app/Contents/Resources/mail-biff-badge.png
 100         echo -n APPLMOZM > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
 101  #       remove CVS dirs from packaged app