diff options
| author | Thomas Wood <thomas.wood@intel.com> | 2015-04-08 11:46:39 +0100 |
|---|---|---|
| committer | Thomas Wood <thomas.wood@intel.com> | 2015-04-08 17:58:32 +0100 |
| commit | 9d98ccb860f529ef0bef4bdffe0733ce348f1d6f (patch) | |
| tree | 2a47f9852bbc40f24f339fe0bbc0e639cd449ea2 /tests/Makefile.am | |
| parent | 4e11307e0786d6a4fac014136c914c019aa9abb4 (diff) | |
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: Thomas Wood <thomas.wood@intel.com>
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index d6de373c..dc864f4f 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) |