=== modified file 'Makefile'
--- Makefile	2007-07-03 16:16:39 +0000
+++ Makefile	2007-07-11 05:30:46 +0000
@@ -72,8 +72,8 @@
 check: build
 	# Run all tests. test_on_merge.py takes care of setting up the
 	# database..
-	env PYTHONPATH=$(PYTHONPATH) \
-	${PYTHON} -t ./test_on_merge.py $(VERBOSITY)
+	env PYTHONPATH="$(PYTHONPATH)" \
+	"${PYTHON}" -t ./test_on_merge.py $(VERBOSITY)
 
 lint:
 	@bash ./utilities/lint.sh
@@ -117,8 +117,9 @@
 
 run: inplace stop bzr_version_info
 	rm -f thread*.request
-	LPCONFIG=${LPCONFIG} PYTHONPATH=$(TWISTEDPATH):$(Z3LIBPATH):$(PYTHONPATH) \
-		 $(PYTHON) -t $(STARTSCRIPT) -r librarian -C $(CONFFILE)
+	LPCONFIG=${LPCONFIG} \
+	   PYTHONPATH="$(TWISTEDPATH)":"$(Z3LIBPATH)":"$(PYTHONPATH)" \
+		 "$(PYTHON)" -t "$(STARTSCRIPT)" -r librarian -C "$(CONFFILE)"
 
 run_all: inplace stop bzr_version_info
 	rm -f thread*.request