From 7e1489ded98e1b8b5ebae5e57a85a5370f78dcf4 Mon Sep 17 00:00:00 2001
From: Fabien Tassin <fta@sofaraway.org>
Date: Mon, 31 Aug 2009 22:21:02 -0500
Subject: [PATCH] Bug 513067 - ""make install" broken when objdir path contains
 '+'" [r=ted]

---
 xpinstall/packager/Packager.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xpinstall/packager/Packager.pm b/xpinstall/packager/Packager.pm
index 0efce164f030..398b16377e29 100644
--- a/xpinstall/packager/Packager.pm
+++ b/xpinstall/packager/Packager.pm
@@ -253,7 +253,7 @@ sub do_copyfile
     if ( $dirflag ) { # directory copy to altdest
       ($destname, $destpath, $destsuffix) = fileparse("$destpathcomp/$altdest/$File::Find::name", '\..*?$');
       # Todo: add MSDOS hack
-      $destpath =~ s|$srcdir/$line/||;  # rm info added by find
+      $destpath =~ s|\Q$srcdir\E/$line/||;  # rm info added by find
       ($debug >= 5) &&
         print " dir copy to altdest: $destpath $destname $destsuffix\n";
     } else {  # single file copy to altdest
@@ -267,7 +267,7 @@ sub do_copyfile
       if ($os eq "MSDOS") {
         $destfile =~ s|\\|/|;
       }
-      $destfile =~ s|$srcdir/||;
+      $destfile =~ s|\Q$srcdir\E/||;
 
       ($destname, $destpath, $destsuffix) = fileparse("$destpathcomp/$destfile", '\..*?$');