Fix make distcheck

* set util binary paths relative to top_builddir
* set pactest.py path relative to top_srcdir
* include tap.py in check_SCRIPTS

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>

2 files changed, 3 insertions, 2 deletions

diff --git a/Makefile.am b/Makefile.am
index 77bc06da..f81fd79e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,13 +31,13 @@ include $(top_srcdir)/test/pacman/tests/TESTS
 
 TEST_EXTENSIONS = .py
 AM_TESTS_ENVIRONMENT = \
-	PMTEST_UTIL_DIR=$(top_srcdir)/src/util/; export PMTEST_UTIL_DIR; \
+	PMTEST_UTIL_DIR=$(top_builddir)/src/util/; export PMTEST_UTIL_DIR; \
 	PMTEST_SCRIPTLIB_DIR=$(top_srcdir)/scripts/library/; export PMTEST_SCRIPTLIB_DIR;
 TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
 								 $(top_srcdir)/build-aux/tap-driver.sh
 PY_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
 								 $(top_srcdir)/build-aux/tap-driver.sh
-PY_LOG_COMPILER = test/pacman/pactest.py
+PY_LOG_COMPILER = $(top_srcdir)/test/pacman/pactest.py
 AM_PY_LOG_FLAGS = \
 		--scriptlet-shell $(SCRIPTLET_SHELL) \
 		--ldconfig $(LDCONFIG) \
diff --git a/test/pacman/Makefile.am b/test/pacman/Makefile.am
index d198ba25..55e3c7a8 100644
--- a/test/pacman/Makefile.am
+++ b/test/pacman/Makefile.am
@@ -8,6 +8,7 @@ check_SCRIPTS = \
 	pmpkg.py \
 	pmrule.py \
 	pmtest.py \
+	tap.py \
 	util.py
 
 noinst_SCRIPTS = $(check_SCRIPTS)