]>
Commit | Line | Data |
---|---|---|
1 | --- mozilla/toolkit/mozapps/installer/packager.mk 2006-12-23 03:38:32.302235167 +0200 | |
2 | +++ mozilla/toolkit/mozapps/installer/packager.mk 2008-03-05 22:59:55.020447000 +0000 | |
3 | @@ -328,13 +328,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_APPNAME) | |
8 | + @mkdir -p $(DESTDIR)$(MOZ_PKG_APPDIR) | |
9 | ifdef MOZ_PKG_MANIFEST | |
10 | $(RM) -rf $(DIST)/xpt | |
11 | $(call PACKAGER_COPY, "$(DIST)",\ | |
12 | - "$(DIST)/$(MOZ_PKG_APPNAME)", \ | |
13 | + "$(DESTDIR)/$(MOZ_PKG_APPDIR)", \ | |
14 | "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1) | |
15 | - $(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_APPNAME)/components -v -x "$(XPIDL_LINK)" | |
16 | + $(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_APPDIR)/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 | @@ -343,7 +343,7 @@ | |
21 | @cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_APPNAME) | |
22 | endif | |
23 | else | |
24 | - @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_APPNAME); tar -xf -) | |
25 | + cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR) | |
26 | endif # DMG | |
27 | endif # MOZ_PKG_MANIFEST | |
28 | ifndef PKG_SKIP_STRIP | |
29 | @@ -375,7 +375,7 @@ | |
30 | endif | |
31 | @echo "Removing unpackaged files..." | |
32 | ifdef NO_PKG_FILES | |
33 | - cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_BINPATH); rm -rf $(NO_PKG_FILES) | |
34 | + cd $(DESTDIR)$(MOZ_PKG_APPDIR)$(_BINPATH); rm -rf $(NO_PKG_FILES) | |
35 | endif | |
36 | ifdef MOZ_PKG_REMOVALS | |
37 | $(SYSINSTALL) $(MOZ_PKG_REMOVALS_GEN) $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_BINPATH) |