From 7e4090edfb77d2a79c41a8285860ee2e051dd427 Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@allmydata.com>
Date: Wed, 19 Sep 2007 16:23:55 -0700
Subject: [PATCH] Makefile: fix and-vs-or bug in check-deps, hide errmsg in
 non-failing cases

---
 Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3923a7e6..1ab835ba 100644
--- a/Makefile
+++ b/Makefile
@@ -105,11 +105,14 @@ endif
 .PHONY: check-deps test test-figleaf figleaf-output
 
 
+signal-error:
+	@echo "ERROR: Not all of Tahoe's dependencies are in place.  Please \
+see the README for help on installing dependencies."
+	exit 1
+
 check-deps:
 	$(PP) \
-	 $(PYTHON) -c 'import allmydata, zfec, foolscap, simplejson, nevow, OpenSSL' || \
-	echo "Not all of Tahoe's dependencies are in place.  Please see the README for help on installing dependencies." && \
-	exit 1
+	 $(PYTHON) -c 'import allmydata, zfec, foolscap, simplejson, nevow, OpenSSL' || $(MAKE) signal-error
 
 .checked-deps:
 	$(MAKE) check-deps
-- 
2.45.2