diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-10 22:46:42 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-10 22:46:42 +0100 |
| commit | 166bed249d59a349ad50ea1842b3147475036269 (patch) | |
| tree | 328c275bc478c34e70cd5f66135e24682ba03ed7 /test | |
| parent | c83287898cc99d9dee75cf4211341be46b1ea39f (diff) | |
| parent | 5bfe1310c4487a5676b9ba0d6034838a8fcd9076 (diff) | |
| download | dbus-166bed249d59a349ad50ea1842b3147475036269.tar.gz | |
Merge branch 'dbus-1.4'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index afa99dc1..99740c9a 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -135,7 +135,7 @@ installcheck_tests += $(installable_tests) if DBUS_ENABLE_INSTALLED_TESTS testexec_PROGRAMS += $(installable_tests) else !DBUS_ENABLE_INSTALLED_TESTS - testexec_PROGRAMS += $(installable_tests) + noinst_PROGRAMS += $(installable_tests) endif !DBUS_ENABLE_INSTALLED_TESTS endif DBUS_ENABLE_MODULAR_TESTS |