mozilla-firefox-install.patch

   1 --- mozilla/toolkit/mozapps/installer/packager.mk.org   2010-01-21 21:10:00.234466295 +0100
   2 +++ mozilla/toolkit/mozapps/installer/packager.mk       2010-01-21 21:10:29.847369216 +0100
   3 @@ -362,13 +362,13 @@
   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 -p $(DESTDIR)/$(MOZ_PKG_APPDIR)
   9  ifdef MOZ_PKG_MANIFEST
  10         $(RM) -rf $(DIST)/xpt
  11         $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
  12 -                "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
  13 +                "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_APPDIR))", \
  14                 "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
  15 -       $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
  16 +       $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_APPDIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
  17  else # !MOZ_PKG_MANIFEST
  18  ifeq ($(MOZ_PKG_FORMAT),DMG)
  19  # If UNIVERSAL_BINARY, the package will be made from an already-prepared
  20 @@ -377,11 +377,11 @@
  21  ifndef STAGE_SDK
  22         @cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_DIR)
  23  else
  24 -       @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
  25 +       cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
  26  endif
  27  endif
  28  else
  29 -       @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
  30 +       cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
  31         @echo "Linking XPT files..."
  32         @rm -rf $(DIST)/xpt
  33         @$(NSINSTALL) -D $(DIST)/xpt
  34 --- mozilla/browser/app/Makefile.in     2008-06-22 22:54:03.000000000 +0200
  35 +++ mozilla/browser/app/Makefile.in     2008-06-23 10:34:59.000000000 +0200
  36 @@ -397,7 +397,7 @@
  37         rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
  38         $(RM) $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/mangle $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/shlibsign
  39  ifdef LIBXUL_SDK
  40 -       cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/firefox-bin
  41 +       cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(MOZ_APP_NAME)-bin
  42  else
  43         rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
  44         rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
  45 @@ -359,7 +359,7 @@
  46  else
  47  ifdef LIBXUL_SDK
  48  libs::
  49 -       cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
  50 +       cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX)
  51  endif
  52  endif
  53
  54 @@ -433,7 +433,7 @@
  55         rsync -a --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework $(DIST)/$(APP_NAME).app/Contents/Frameworks
  56  else
  57         $(NSINSTALL) -D $(DIST)/bin/xulrunner
  58 -       (cd $(LIBXUL_SDK)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DIST)/bin/xulrunner && tar -xf -)
  59 +       cp -rfRp $(LIBXUL_SDK)/bin $(DIST)/bin/xulrunner
  60  endif # cocoa
  61  endif # SKIP_COPY_XULRUNNER
  62  endif # LIBXUL_SDK