[next] telepathy-glib: Use a telepathy-1 namespaced location for installed tests

Simon McVittie smcv at kemper.freedesktop.org
Wed May 14 07:04:07 PDT 2014


Module: telepathy-glib
Branch: next
Commit: 542edd840ea336fbabdba4c4ce72b168065e82b1
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=542edd840ea336fbabdba4c4ce72b168065e82b1

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed May 14 09:02:30 2014 +0100

Use a telepathy-1 namespaced location for installed tests

---

 configure.ac           |    2 +-
 tests/Makefile.am      |    2 +-
 tests/dbus/Makefile.am |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9e48d15..01dbfc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -246,7 +246,7 @@ dnl docs/Makefile.am needs to know whether it's an out of tree build
 dnl (srcdir != builddir)
 AM_CONDITIONAL([OUT_OF_TREE_BUILD], [test "z$ac_srcdir" != z.])
 
-tpglibtestsdir=${libdir}/telepathy-glib-tests
+tpglibtestsdir=${libdir}/telepathy-glib-1-tests
 AC_SUBST(tpglibtestsdir)
 
 dnl Check for Glib
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e022e51..b988717 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -40,7 +40,7 @@ tests_PROGRAMS = $(programs_list)
 tests_DATA = tpglib-tests.list
 CLEANFILES += $(tests_DATA)
 
-insttestdir = ${datadir}/installed-tests/telepathy-glib
+insttestdir = ${datadir}/installed-tests/telepathy-glib-1
 insttest_DATA = $(patsubst %,%.test,$(programs_list))
 CLEANFILES += $(insttest_DATA)
 
diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
index 1209967..3458928 100644
--- a/tests/dbus/Makefile.am
+++ b/tests/dbus/Makefile.am
@@ -75,7 +75,7 @@ CLEANFILES += \
 	$(tests_SCRIPTS) \
 	$(NULL)
 
-insttestdir = ${datadir}/installed-tests/telepathy-glib
+insttestdir = ${datadir}/installed-tests/telepathy-glib-1
 insttest_DATA = $(patsubst %,%.test,$(tests_list))
 CLEANFILES += $(insttest_DATA)
 else



More information about the telepathy-commits mailing list