Commit 9d98ccb8 authored by Thomas Wood's avatar Thomas Wood

tests: use standard install prefix for programs, scripts and data

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@linux.intel.com>
Signed-off-by: default avatarThomas Wood <thomas.wood@intel.com>
parent 4e11307e
......@@ -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)
......
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 \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment