From fc45990217463c19deabb3543fe0efa16bd8a8a1 Mon Sep 17 00:00:00 2001
From: "nrthomas%gmail.com"
 <nrthomas%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 28 Dec 2006 20:23:47 +0000
Subject: [PATCH] Bug 339933, fix packaging with make v3.81, p=cls%seawood.org,
 r=bsmedberg, a=jay

git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@217526 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/toolkit/mozapps/installer/packager.mk | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/mozilla/toolkit/mozapps/installer/packager.mk b/mozilla/toolkit/mozapps/installer/packager.mk
index 4bef120a2fb..4a7a431225a 100644
--- a/mozilla/toolkit/mozapps/installer/packager.mk
+++ b/mozilla/toolkit/mozapps/installer/packager.mk
@@ -272,6 +272,12 @@ endif
 
 PKG_ARG = , "$(pkg)"
 
+# Define packager macro to work around make 3.81 backslash issue (bug #339933)
+define PACKAGER_COPY
+$(PERL) -I$(topsrcdir)/xpinstall/packager -e 'use Packager; \
+       Packager::Copy($1,$2,$3,$4,$5,$6,$7);'
+endef
+
 installer-stage: $(MOZ_PKG_MANIFEST)
 ifndef MOZ_PKG_MANIFEST
 	$(error MOZ_PKG_MANIFEST unspecified!)
@@ -282,18 +288,18 @@ endif
 	@$(NSINSTALL) -D $(DEPTH)/installer-stage/localized
 	@$(NSINSTALL) -D $(DEPTH)/installer-stage/optional
 	@$(NSINSTALL) -D $(DIST)/xpt
-	$(PERL) -I$(topsrcdir)/xpinstall/packager -e 'use Packager; \
-	  Packager::Copy("$(DIST)", "$(DEPTH)/installer-stage/nonlocalized", \
-	                 "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
-	    $(foreach pkg,$(MOZ_NONLOCALIZED_PKG_LIST),$(PKG_ARG)) );'
-	$(PERL) -I$(topsrcdir)/xpinstall/packager -e 'use Packager; \
-	  Packager::Copy("$(DIST)", "$(DEPTH)/installer-stage/localized", \
-	                 "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
-	    $(foreach pkg,$(MOZ_LOCALIZED_PKG_LIST),$(PKG_ARG)) );'
-	$(PERL) -I$(topsrcdir)/xpinstall/packager -e 'use Packager; \
-	  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, "$(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, "$(DIST)",\
+		"$(DEPTH)/installer-stage/optional", \
+		"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
+		$(foreach pkg,$(MOZ_OPTIONAL_PKG_LIST),$(PKG_ARG)) )
 	$(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DEPTH)/installer-stage/nonlocalized/components -v
 
 stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN)
@@ -304,9 +310,9 @@ stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN)
 	@mkdir $(DIST)/$(MOZ_PKG_APPNAME)
 ifdef MOZ_PKG_MANIFEST
 	$(RM) -rf $(DIST)/xpt
-	$(PERL) -I$(topsrcdir)/xpinstall/packager -e 'use Packager; \
-	  Packager::Copy("$(DIST)", "$(DIST)/$(MOZ_PKG_APPNAME)", \
-	                 "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1);'
+	$(call PACKAGER_COPY, "$(DIST)",\
+		 "$(DIST)/$(MOZ_PKG_APPNAME)", \
+		"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
 	$(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_APPNAME)/components -v
 else # !MOZ_PKG_MANIFEST
 ifeq ($(MOZ_PKG_FORMAT),DMG)