aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>2013-02-05 16:23:25 -0500
committerMathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>2013-02-05 16:23:25 -0500
commitfe1d7264661c4112575116bd7ef5c6aaba29575a (patch)
tree4b0bc305347ba103391886be21d0eddb9d09c743 /tests
parent22a384d76cad4f921d7d51240cdc7c623cda03e1 (diff)
downloadayatana-ido-fe1d7264661c4112575116bd7ef5c6aaba29575a.tar.gz
ayatana-ido-fe1d7264661c4112575116bd7ef5c6aaba29575a.tar.bz2
ayatana-ido-fe1d7264661c4112575116bd7ef5c6aaba29575a.zip
Avoid FTBFS due to conflicting paths to gtest source, or because the relevant gtest files aren't found -- always use the xorg-gtest gtest source, and adjust path accordingly.
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 89b9b5b..5024fe7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,7 +15,7 @@ AM_CPPFLAGS = \
nodist_libgtest_a_SOURCES = \
$(XORG_GTEST_SOURCE)/src/xorg-gtest-all.cpp \
- $(GTEST_SOURCE)/src/gtest-all.cc \
+ $(GTEST_SOURCE)/gtest-all.cc \
$(XORG_GTEST_SOURCE)/src/xorg-gtest_main.cpp
libgtest_a_CPPFLAGS = \
$(XORG_GTEST_CPPFLAGS) \