From db099126b53b55695071a29bc94c954d00cb62ec Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Thu, 29 Jul 2010 22:46:47 -0700
Subject: [PATCH] [Windows only] use absolute paths for Bug 575838 - Build
 scripts should be able to handle
 @BINPATH@/extensions/testpilot@labs.mozilla.com/* in package-manifest.in for
 the installer. r=ted.mielczarek, approval2.0=benjamin

---
 browser/installer/Makefile.in         |  4 ----
 toolkit/mozapps/installer/packager.mk | 28 +++++++++++++--------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
index e36038691cb1..cfba2ab80bed 100644
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -65,10 +65,6 @@ MOZ_NONLOCALIZED_PKG_LIST = \
 
 MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
 
-MOZ_OPTIONAL_PKG_LIST = \
-	adt \
-	$(NULL)
-
 DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
 ifdef MOZ_ENABLE_GNOME_COMPONENT
 DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index 8ab3c862a393..5c4630aad3fd 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -349,19 +349,19 @@ endif
 	@$(NSINSTALL) -D $(DEPTH)/installer-stage/localized
 	@$(NSINSTALL) -D $(DEPTH)/installer-stage/optional
 	@$(NSINSTALL) -D $(DIST)/xpt
-	$(call PACKAGER_COPY, "$(DIST)",\
-		"$(DEPTH)/installer-stage/nonlocalized", \
-		"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
-		$(foreach pkg,$(MOZ_NONLOCALIZED_PKG_LIST),$(PKG_ARG)) )
-	$(call PACKAGER_COPY, "$(DIST)",\
-		"$(DEPTH)/installer-stage/localized", \
-		"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
-		$(foreach pkg,$(MOZ_LOCALIZED_PKG_LIST),$(PKG_ARG)) )
+	$(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
+	  "$(call core_abspath,$(DEPTH)/installer-stage/nonlocalized)", \
+	  "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
+	  $(foreach pkg,$(MOZ_NONLOCALIZED_PKG_LIST),$(PKG_ARG)) )
+	$(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
+	  "$(call core_abspath,$(DEPTH)/installer-stage/localized)", \
+	  "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
+	  $(foreach pkg,$(MOZ_LOCALIZED_PKG_LIST),$(PKG_ARG)) )
 ifdef MOZ_OPTIONAL_PKG_LIST
-	$(call PACKAGER_COPY, "$(DIST)",\
-		"$(DEPTH)/installer-stage/optional", \
-		"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
-		$(foreach pkg,$(MOZ_OPTIONAL_PKG_LIST),$(PKG_ARG)) )
+	$(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
+	  "$(call core_abspath,$(DEPTH)/installer-stage/optional)", \
+	  "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
+	  $(foreach pkg,$(MOZ_OPTIONAL_PKG_LIST),$(PKG_ARG)) )
 endif
 	$(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DEPTH)/installer-stage/nonlocalized/components -v -x "$(XPIDL_LINK)"
 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py $(DIST)/manifests $(DEPTH)/installer-stage/nonlocalized
@@ -379,8 +379,8 @@ ifndef UNIVERSAL_BINARY
 ifdef MOZ_PKG_MANIFEST
 	$(RM) -rf $(DIST)/xpt $(RM) -rf $(DIST)/manifests
 	$(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
-		 "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
-		"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
+	  "$(call core_abspath,$(DIST)/$(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)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py $(DIST)/manifests $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)
 else # !MOZ_PKG_MANIFEST