[Telepathy-commits] [telepathy-qt4/master] Do not replace XDG_DATA_DIRS, prepend tests dir to already existing one.

Andre Moreira Magalhaes (andrunko) andre.magalhaes at collabora.co.uk
Wed Jan 7 18:13:42 PST 2009


Do not replace XDG_DATA_DIRS, prepend tests dir to already existing one, so
cm-basics is able to find pinocchio manager file.
---
 tests/pinocchio/Makefile.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/tests/pinocchio/Makefile.am b/tests/pinocchio/Makefile.am
index 595caf2..3c9b70d 100644
--- a/tests/pinocchio/Makefile.am
+++ b/tests/pinocchio/Makefile.am
@@ -49,11 +49,12 @@ AM_CXXFLAGS = \
     $(ERROR_CXXFLAGS) \
     $(LIB_CFLAGS)
 
+# FIXME: XDG_DATA_DIRS should not depend on external setup
 TESTS_ENV = \
     abs_top_builddir=@abs_top_builddir@ \
     abs_top_srcdir=@abs_top_srcdir@ \
     XDG_DATA_HOME=@abs_top_builddir@/tests \
-    XDG_DATA_DIRS=@abs_top_srcdir@/tests \
+    XDG_DATA_DIRS=@abs_top_srcdir@/tests:$(XDG_DATA_DIRS) \
     PINOCCHIO=@PINOCCHIO@ \
     PINOCCHIO_CTL=@PINOCCHIO_CTL@ \
     PINOCCHIO_DATA_DIR=@abs_srcdir@ \
-- 
1.5.6.5




More information about the Telepathy-commits mailing list