mozilla-firefox-install.patch

   1 --- mozilla/browser/app/Makefile.in     2008-06-22 22:54:03.000000000 +0200
   2 +++ mozilla/browser/app/Makefile.in     2008-06-23 10:34:59.000000000 +0200
   3 @@ -397,7 +397,7 @@
   4         rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
   5         $(RM) $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/mangle $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/shlibsign
   6  ifdef LIBXUL_SDK
   7 -       cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/firefox
   8 +       cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(MOZ_APP_NAME)
   9  else
  10         rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
  11         rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
  12 @@ -359,7 +359,7 @@
  13  else
  14  ifdef LIBXUL_SDK
  15  libs::
  16 -       cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
  17 +       cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX)
  18  endif
  19  endif
  20
  21 @@ -433,7 +433,7 @@
  22         rsync -a --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework $(DIST)/$(APP_NAME).app/Contents/Frameworks
  23  else
  24         $(NSINSTALL) -D $(DIST)/bin/xulrunner
  25 -       (cd $(LIBXUL_SDK)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DIST)/bin/xulrunner && tar -xf -)
  26 +       cp -rfRp $(LIBXUL_SDK)/bin $(DIST)/bin/xulrunner
  27  endif # cocoa
  28  endif # SKIP_COPY_XULRUNNER
  29  endif # LIBXUL_SDK
  30 --- mozilla/toolkit/mozapps/installer/packager.mk.orig  2011-03-19 00:34:12.000000000 +0100
  31 +++ mozilla/toolkit/mozapps/installer/packager.mk       2011-03-22 23:53:43.877485659 +0100
  32 @@ -496,30 +496,30 @@
  33  endif
  34
  35  stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack
  36 -       @rm -rf $(DIST)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
  37 +       @rm -rf $(DESTDIR)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
  38  # NOTE: this must be a tar now that dist links into the tree so that we
  39  # do not strip the binaries actually in the tree.
  40         @echo "Creating package directory..."
  41 -       @mkdir $(DIST)/$(MOZ_PKG_DIR)
  42 +       @mkdir -p $(DESTDIR)/$(MOZ_PKG_DIR)
  43  ifndef UNIVERSAL_BINARY
  44  # If UNIVERSAL_BINARY, the package will be made from an already-prepared
  45  # STAGEPATH
  46  ifdef MOZ_PKG_MANIFEST
  47         $(RM) -rf $(DIST)/xpt $(DIST)/manifests
  48         $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
  49 -         "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
  50 +         "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \
  51           "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
  52 -       $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
  53 +       $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
  54         $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
  55 -         $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
  56 +         $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
  57           $(patsubst %,$(DIST)/manifests/%/components,$(MOZ_NONLOCALIZED_PKG_LIST))
  58         $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
  59 -         $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \
  60 +         $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \
  61           $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_NONLOCALIZED_PKG_LIST))
  62         $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
  63 -         $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
  64 +         $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
  65           $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_LOCALIZED_PKG_LIST))
  66 -       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
  67 +       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
  68  else # !MOZ_PKG_MANIFEST
  69  ifeq ($(MOZ_PKG_FORMAT),DMG)
  70  ifndef STAGE_SDK
  71 @@ -529,10 +529,10 @@
  72         @$(NSINSTALL) -D $(DIST)/xpt
  73         @($(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...
  74  else
  75 -       @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
  76 +       cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR)
  77  endif
  78  else
  79 -       @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
  80 +       cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR)
  81         @echo "Linking XPT files..."
  82         @rm -rf $(DIST)/xpt
  83         @$(NSINSTALL) -D $(DIST)/xpt
  84 @@ -620,7 +620,7 @@
  85         cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
  86  endif
  87         $(NSINSTALL) -D $(DESTDIR)$(installdir)
  88 -       (cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
  89 +       (cd $(DESTDIR)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
  90           (cd $(DESTDIR)$(installdir) && tar -xf -)
  91         $(NSINSTALL) -D $(DESTDIR)$(bindir)
  92         $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)