Makefile: fix and-vs-or bug in check-deps, hide errmsg in non-failing cases

diff --git a/Makefile b/Makefile
index 3923a7e6516653ad0116aa7bb88bd5b55319c8c8..1ab835baa936001eca055398aa2cea810441ce37 100644 (file)
--- 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