From dafa5c9a21a46ee842ad86b7687bfbffe9902a98 Mon Sep 17 00:00:00 2001
From: "slamm%netscape.com" <slamm%netscape.com>
Date: Tue, 29 Feb 2000 21:00:21 +0000
Subject: [PATCH] Fix client.mk for case when building in mozilla/mozilla.
 r=endico

---
 client.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client.mk b/client.mk
index 14c83fe7c1b85..903c3f1cbe562 100644
--- a/client.mk
+++ b/client.mk
@@ -48,7 +48,7 @@
 #
 
 CWD		:= $(shell pwd)
-ifeq (mozilla, $(notdir $(CWD)))
+ifneq (, $(wildcard client.mk))
 ROOTDIR		:= $(shell dirname $(CWD))
 TOPSRCDIR       := $(CWD)
 else
@@ -215,6 +215,7 @@ real_checkout:
 	  echo "$(MAKE): *** Conflicts during checkout." ;\
 	  echo "$$conflicts" ;\
 	  echo "$(MAKE): Refer to $(CVSCO_LOGFILE) for full log." ;\
+	  exit 1; \
 	else true; \
 	fi; \
 	if test -f cvs-failed.tmp ; then \
-- 
GitLab