[tor-commits] [torbrowser/maint-2.2] Fix patching of start-msvcX.bat.

[erinn at torproject.org]

commit 1ee67f4606f921be1c9e135ea2692e316bdacbd5
Author: Shondoit Walker <shondoit at gmail.com>
Date:   Sat Jun 9 15:00:27 2012 +0200

    Fix patching of start-msvcX.bat.
    
    Changes seem to be made in the new Firefox releases, which requires
    us to change our patching to call the Makefile in $(OBJDIR).
---
 src/current-patches/mozilla-build/start-msvc.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/current-patches/mozilla-build/start-msvc.patch b/src/current-patches/mozilla-build/start-msvc.patch
index 4101d89..6ca3c55 100644
--- a/src/current-patches/mozilla-build/start-msvc.patch
+++ b/src/current-patches/mozilla-build/start-msvc.patch
@@ -28,5 +28,5 @@ So instead of running the actual packaging command we 'run' true instead.
 +if "%1"=="" (
 +	start /d "%USERPROFILE%" "" "%MOZILLABUILD%"\msys\bin\bash --login -i"
 +) else (
-+	cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build package INNER_MAKE_PACKAGE=true"
++	cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build && "%2" "%3" -C obj-* package INNER_MAKE_PACKAGE=true"
 +)