From 409988a038e843e1fa413604b5a7080e71693e13 Mon Sep 17 00:00:00 2001
From: "Philippe M. Chiasson" <gozer@mozilla.com>
Date: Mon, 24 Oct 2011 12:05:45 +0100
Subject: [PATCH] Bug 695812 - client.mk with RUN_CLIENT_PY doesn't work with
 mozconfigs that include from mozilla/. This should fix Mac builds on try
 server. r=Standard8,Callek

---
 client.mk | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/client.mk b/client.mk
index 1268af2156..90cda512f9 100644
--- a/client.mk
+++ b/client.mk
@@ -175,13 +175,12 @@ CONFIGURES += $(TOPSRCDIR)/mozilla/js/src/configure
 build::
 
 # These targets are candidates for auto-running client.py
-ifdef  ALWAYS_RUN_CLIENT_PY
-ifeq (0,${MAKELEVEL})
-build::                      run_client_py
-profiledbuild::              run_client_py
-configure::                  run_client_py
-endif
-endif
+
+ifeq (01,$(MAKELEVEL)$(if $(ALWAYS_RUN_CLIENT_PY),1,))
+
+build profiledbuild configure:: run_client_py
+	$(MAKE) -f $(TOPSRCDIR)/client.mk $@
+else
 
 
 # Print out any options loaded from mozconfig.
@@ -385,6 +384,7 @@ ifdef MOZ_POSTFLIGHT
 endif
 
 endif # MOZ_CURRENT_PROJECT
+endif # RAN_CLIENT_PY
 
 ####################################
 # Postflight, after building all projects