Use the pkglibexec and pkgdata prefixes rather than setting bindir and
datadir. This also removes the extra 'tests' directory from within the
package libexec and data directories.
Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
Signed-off-by: Thomas Wood <thomas.wood@xxxxxxxxx>
---
tests/Makefile.am | 15 +++++++++++----
tests/Makefile.sources | 15 ---------------
2 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d6de373..dc864f4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,18 +27,25 @@ multi-tests.txt: Makefile.sources
@echo ${multi_kernel_tests} >> $@
@echo END TESTLIST >> $@
-igt_tests_bin_PROGRAMS += \
+noinst_PROGRAMS = \
+ $(HANG) \
+ $(TESTS_testsuite) \
+ $(NULL)
+
+pkglibexec_PROGRAMS = \
+ gem_alive \
+ gem_stress \
$(TESTS_progs) \
$(TESTS_progs_M) \
$(NULL)
-dist_igt_tests_bin_SCRIPTS = \
+dist_pkglibexec_SCRIPTS = \
$(TESTS_scripts) \
$(TESTS_scripts_M) \
$(scripts) \
$(NULL)
-dist_igt_tests_data_DATA = \
+dist_pkgdata_DATA = \
$(IMAGES) \
$(NULL)
@@ -52,7 +59,7 @@ AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(DEBUG_CFLAGS)\
-I$(srcdir)/../lib \
-include "$(srcdir)/../lib/check-ndebug.h" \
-DIGT_SRCDIR=\""$(abs_srcdir)"\" \
- -DIGT_DATADIR=\""$(igt_tests_datadir)"\" \
+ -DIGT_DATADIR=\""$(pkgdatadir)"\" \
$(LIBUNWIND_CFLAGS) \
$(NULL)
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 59a06e9..4bf11bf 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -1,18 +1,3 @@
-igt_tests_bindir = $(pkglibexecdir)/tests
-igt_tests_datadir = $(pkgdatadir)/tests
-
-noinst_PROGRAMS = \
- $(HANG) \
- $(TESTS_testsuite) \
- $(NULL)
-
-igt_tests_bin_PROGRAMS = \
- gem_alive \
- gem_stress \
- $(TESTS_progs) \
- $(TESTS_progs_M) \
- $(NULL)
-
NOUVEAU_TESTS_M = \
prime_nv_api \
prime_nv_pcopy \
--
2.1.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
