summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2011-04-26 12:48:23 +0200
committerMartin Pitt <martin.pitt@ubuntu.com>2011-04-26 12:48:23 +0200
commit37fdb2c9595922692e43c84c513f161970bcd02f (patch)
tree1869bff29cd9e66cbc1ab5c1a49f59dc6a4b08c5
parent065c597b88a45625e7edf273b3b67add126cfb9f (diff)
trivial: Fix Linux integration-test for distcheck
distcheck uses a separate build tree, thus call the script from the right directory. Also actually ship it in release tarballs.
-rw-r--r--src/linux/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/linux/Makefile.am b/src/linux/Makefile.am
index 1edc31d..a2a5e8f 100644
--- a/src/linux/Makefile.am
+++ b/src/linux/Makefile.am
@@ -44,7 +44,8 @@ libupshared_la_SOURCES = \
$(idevice_files) \
$(BUILT_SOURCES)
-EXTRA_DIST = $(libupshared_la_SOURCES)
+EXTRA_DIST = $(libupshared_la_SOURCES) \
+ integration-test
libupshared_la_CFLAGS = \
$(WARNINGFLAGS_C)
@@ -53,7 +54,7 @@ if UP_BUILD_TESTS
DBUS_LAUNCH=$(shell which dbus-launch)
check-local: $(top_builddir)/src/upowerd
- env top_builddir=$(top_builddir) $(DBUS_LAUNCH) ./integration-test -v
+ env top_builddir=$(top_builddir) $(DBUS_LAUNCH) $(srcdir)/integration-test -v
endif
clean-local :