[Telepathy-commits] [telepathy-gabble/master] Alter PYTHONPATH so gabbleconfig.py is picked up correctly in out-of-tree builds, fixing distcheck

[Simon McVittie]

20080509151627-53eee-ab037d0eccab37b238e1aa3405c1bdcbf6d1d735.gz
---
 tests/twisted/Makefile.am |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index a424f30..f688add 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -52,7 +52,7 @@ TWISTED_TESTS = \
 TESTS =
 
 TESTS_ENVIRONMENT = \
-	PYTHONPATH=@abs_top_srcdir@/tests/twisted
+	PYTHONPATH=@abs_top_srcdir@/tests/twisted:@abs_top_builddir@/tests/twisted
 
 check-local: check-coding-style check-twisted
 
@@ -60,7 +60,8 @@ check-twisted:
 	$(MAKE) -C tools
 	rm -f tools/core
 	sh $(srcdir)/tools/with-session-bus.sh --config-file=tools/tmp-session-bus.conf -- $(MAKE) check-TESTS \
-		TESTS="$(TWISTED_TESTS)" TESTS_ENVIRONMENT="PYTHONPATH=@abs_top_srcdir@/tests/twisted $(TEST_PYTHON)"
+		TESTS="$(TWISTED_TESTS)" \
+		TESTS_ENVIRONMENT="$(TESTS_ENVIRONMENT) $(TEST_PYTHON)"
 	@if test -e tools/core; then\
 		echo "Core dump exists: tools/core";\
 		exit 1;\
-- 
1.5.6.3