From: david-sarah <david-sarah@jacaranda.org>
Date: Wed, 19 Jan 2011 23:44:29 +0000 (-0800)
Subject: Makefile: consistently use TAHOE macro to run bin/tahoe. Use '$(TAHOE) debug repl... 
X-Git-Tag: allmydata-tahoe-1.8.2b1~30
X-Git-Url: https://git.rkrishnan.org/listings/pb.xhtml?a=commitdiff_plain;h=d4969259c68bbe77d41958d10e68a20a339f30dd;p=tahoe-lafs%2Ftahoe-lafs.git

Makefile: consistently use TAHOE macro to run bin/tahoe. Use '$(TAHOE) debug repl' instead of $(RUNPP) -p. refs #1296
---

diff --git a/Makefile b/Makefile
index ae051907..8a133151 100644
--- a/Makefile
+++ b/Makefile
@@ -220,11 +220,11 @@ check-memory-once: .built
 check-speed: .built
 	if [ -z '$(TESTCLIENTDIR)' ]; then exit 1; fi
 	@echo "stopping any leftover client code"
-	-$(PYTHON) bin/tahoe stop $(TESTCLIENTDIR)
-	$(PYTHON) bin/tahoe start $(TESTCLIENTDIR)
+	-$(TAHOE) stop $(TESTCLIENTDIR)
+	$(TAHOE) start $(TESTCLIENTDIR)
 	sleep 5
 	$(PYTHON) src/allmydata/test/check_speed.py $(TESTCLIENTDIR)
-	$(PYTHON) bin/tahoe stop $(TESTCLIENTDIR)
+	$(TAHOE) stop $(TESTCLIENTDIR)
 
 # The check-grid target also uses a pre-established client node, along with a
 # long-term directory that contains some well-known files. See the docstring
@@ -239,7 +239,7 @@ bench-dirnode: .built
 # 'make repl' is a simple-to-type command to get a Python interpreter loop
 # from which you can type 'import allmydata'
 repl:
-	$(RUNPP) -p
+	$(TAHOE) debug repl
 
 test-darcs-boringfile:
 	$(MAKE)