--- /dev/null
+diff -ur mozilla.orig/mozilla/toolkit/mozapps/installer/packager.mk mozilla/mozilla/toolkit/mozapps/installer/packager.mk
+--- mozilla.orig/mozilla/toolkit/mozapps/installer/packager.mk 2009-12-26 17:37:14.000000000 +0100
++++ mozilla/mozilla/toolkit/mozapps/installer/packager.mk 2009-12-26 17:41:14.000000000 +0100
+@@ -365,13 +365,13 @@
+ # 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_DIR)
++ @mkdir $(DESTDIR)/$(MOZ_PKG_DIR)
+ ifdef MOZ_PKG_MANIFEST
+ $(RM) -rf $(DIST)/xpt
+ $(call PACKAGER_COPY, "$(DIST)",\
+- "$(DIST)/$(MOZ_PKG_DIR)", \
++ "$(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)/components -v -x "$(XPIDL_LINK)"
++ $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_DIR)/components -v -x "$(XPIDL_LINK)"
+ else # !MOZ_PKG_MANIFEST
+ ifeq ($(MOZ_PKG_FORMAT),DMG)
+ # If UNIVERSAL_BINARY, the package will be made from an already-prepared
+@@ -380,11 +380,11 @@
+ ifndef STAGE_SDK
+ @cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_DIR)
+ else
+- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
++ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR)
+ endif
+ endif
+ else
+- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
++ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR)
+ endif # DMG
+ endif # MOZ_PKG_MANIFEST
+ ifndef PKG_SKIP_STRIP
+@@ -423,7 +423,7 @@
+ endif # PKG_SKIP_STRIP
+ @echo "Removing unpackaged files..."
+ ifdef NO_PKG_FILES
+- cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
++ cd $(DESTDIR)$(MOZ_PKG_DIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
+ endif
+ ifdef MOZ_PKG_REMOVALS
+ $(SYSINSTALL) $(IFLAGS1) $(MOZ_PKG_REMOVALS_GEN) $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)