Eliminate scndir, docdir. Use rtems_testsdir instead.

28 files changed, 56 insertions, 112 deletions

diff --git a/testsuites/mptests/mp01/node1/Makefile.am b/testsuites/mptests/mp01/node1/Makefile.am
index a83e0a403b..6a81f8727e 100644
--- a/testsuites/mptests/mp01/node1/Makefile.am
+++ b/testsuites/mptests/mp01/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp
 rtems_tests_PROGRAMS = mp01-node1.exe
 mp01_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp01-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp01-node1.doc
+dist_rtems_tests_DATA = mp01-node1.scn
+dist_rtems_tests_DATA += mp01-node1.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp01/node2/Makefile.am b/testsuites/mptests/mp01/node2/Makefile.am
index 97a7ab1c5a..a078a2a2a8 100644
--- a/testsuites/mptests/mp01/node2/Makefile.am
+++ b/testsuites/mptests/mp01/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp
 rtems_tests_PROGRAMS = mp01-node2.exe
 mp01_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp01-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp01-node2.doc
+dist_rtems_tests_DATA = mp01-node2.scn
+dist_rtems_tests_DATA += mp01-node2.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp02/node1/Makefile.am b/testsuites/mptests/mp02/node1/Makefile.am
index 4fa7487c71..4ccfbfd501 100644
--- a/testsuites/mptests/mp02/node1/Makefile.am
+++ b/testsuites/mptests/mp02/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp
 rtems_tests_PROGRAMS = mp02-node1.exe
 mp02_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp02-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp02-node1.doc
+dist_rtems_tests_DATA = mp02-node1.scn
+dist_rtems_tests_DATA += mp02-node1.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp02/node2/Makefile.am b/testsuites/mptests/mp02/node2/Makefile.am
index b61821f4e2..2e0fcf231c 100644
--- a/testsuites/mptests/mp02/node2/Makefile.am
+++ b/testsuites/mptests/mp02/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp
 rtems_tests_PROGRAMS = mp02-node2.exe
 mp02_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp02-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp02-node2.doc
+dist_rtems_tests_DATA = mp02-node2.scn
+dist_rtems_tests_DATA += mp02-node2.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp03/node1/Makefile.am b/testsuites/mptests/mp03/node1/Makefile.am
index 39112a24b4..333caef403 100644
--- a/testsuites/mptests/mp03/node1/Makefile.am
+++ b/testsuites/mptests/mp03/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp timer event
 rtems_tests_PROGRAMS = mp03-node1.exe
 mp03_node1_exe_SOURCES = ../init.c ../task1.c ../delay.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp03-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp03-node1.doc
+dist_rtems_tests_DATA = mp03-node1.scn
+dist_rtems_tests_DATA += mp03-node1.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp03/node2/Makefile.am b/testsuites/mptests/mp03/node2/Makefile.am
index d21fe15db5..f49c7b46c7 100644
--- a/testsuites/mptests/mp03/node2/Makefile.am
+++ b/testsuites/mptests/mp03/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp timer event
 rtems_tests_PROGRAMS = mp03-node2.exe
 mp03_node2_exe_SOURCES = ../init.c ../delay.c ../task1.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp03-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp03-node2.doc
+dist_rtems_tests_DATA = mp03-node2.scn
+dist_rtems_tests_DATA += mp03-node2.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp04/node1/Makefile.am b/testsuites/mptests/mp04/node1/Makefile.am
index b38fd3b99e..f9bd3db92b 100644
--- a/testsuites/mptests/mp04/node1/Makefile.am
+++ b/testsuites/mptests/mp04/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp
 rtems_tests_PROGRAMS = mp04-node1.exe
 mp04_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp04-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp04-node1.doc
+dist_rtems_tests_DATA = mp04-node1.scn
+dist_rtems_tests_DATA += mp04-node1.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp04/node2/Makefile.am b/testsuites/mptests/mp04/node2/Makefile.am
index 21f1f0c5cb..c6424d4b78 100644
--- a/testsuites/mptests/mp04/node2/Makefile.am
+++ b/testsuites/mptests/mp04/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp
 rtems_tests_PROGRAMS = mp04-node2.exe
 mp04_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp04-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp04-node2.doc
+dist_rtems_tests_DATA = mp04-node2.scn
+dist_rtems_tests_DATA += mp04-node2.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp05/node1/Makefile.am b/testsuites/mptests/mp05/node1/Makefile.am
index 931b8cda0a..39e2170af0 100644
--- a/testsuites/mptests/mp05/node1/Makefile.am
+++ b/testsuites/mptests/mp05/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp signal timer
 rtems_tests_PROGRAMS = mp05-node1.exe
 mp05_node1_exe_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp05-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp05-node1.doc
+dist_rtems_tests_DATA = mp05-node1.scn
+dist_rtems_tests_DATA += mp05-node1.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp05/node2/Makefile.am b/testsuites/mptests/mp05/node2/Makefile.am
index cbcc359268..690b7af478 100644
--- a/testsuites/mptests/mp05/node2/Makefile.am
+++ b/testsuites/mptests/mp05/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp signal timer
 rtems_tests_PROGRAMS = mp05-node2.exe
 mp05_node2_exe_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp05-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp05-node2.doc
+dist_rtems_tests_DATA = mp05-node2.scn
+dist_rtems_tests_DATA += mp05-node2.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp06/node1/Makefile.am b/testsuites/mptests/mp06/node1/Makefile.am
index a81821cf10..91fff7f456 100644
--- a/testsuites/mptests/mp06/node1/Makefile.am
+++ b/testsuites/mptests/mp06/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp event timer
 rtems_tests_PROGRAMS = mp06-node1.exe
 mp06_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp06-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp06-node1.doc
+dist_rtems_tests_DATA = mp06-node1.scn
+dist_rtems_tests_DATA += mp06-node1.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp06/node2/Makefile.am b/testsuites/mptests/mp06/node2/Makefile.am
index 9899489a58..705e9f8e31 100644
--- a/testsuites/mptests/mp06/node2/Makefile.am
+++ b/testsuites/mptests/mp06/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp event timer
 rtems_tests_PROGRAMS = mp06-node2.exe
 mp06_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp06-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp06-node2.doc
+dist_rtems_tests_DATA = mp06-node2.scn
+dist_rtems_tests_DATA += mp06-node2.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp07/node1/Makefile.am b/testsuites/mptests/mp07/node1/Makefile.am
index 07579d9368..c6dad99aa8 100644
--- a/testsuites/mptests/mp07/node1/Makefile.am
+++ b/testsuites/mptests/mp07/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp event timer
 rtems_tests_PROGRAMS = mp07-node1.exe
 mp07_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp07-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp07-node1.doc
+dist_rtems_tests_DATA = mp07-node1.scn
+dist_rtems_tests_DATA += mp07-node1.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp07/node2/Makefile.am b/testsuites/mptests/mp07/node2/Makefile.am
index e8232b874c..500f0f55bd 100644
--- a/testsuites/mptests/mp07/node2/Makefile.am
+++ b/testsuites/mptests/mp07/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp event timer
 rtems_tests_PROGRAMS = mp07-node2.exe
 mp07_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp07-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp07-node2.doc
+dist_rtems_tests_DATA = mp07-node2.scn
+dist_rtems_tests_DATA += mp07-node2.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp08/node1/Makefile.am b/testsuites/mptests/mp08/node1/Makefile.am
index f778d67b45..471b446fb2 100644
--- a/testsuites/mptests/mp08/node1/Makefile.am
+++ b/testsuites/mptests/mp08/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp semaphore
 rtems_tests_PROGRAMS = mp08-node1.exe
 mp08_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp08-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp08-node1.doc
+dist_rtems_tests_DATA = mp08-node1.scn
+dist_rtems_tests_DATA += mp08-node1.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp08/node2/Makefile.am b/testsuites/mptests/mp08/node2/Makefile.am
index 641b27ff8c..cd06712f89 100644
--- a/testsuites/mptests/mp08/node2/Makefile.am
+++ b/testsuites/mptests/mp08/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp semaphore
 rtems_tests_PROGRAMS = mp08-node2.exe
 mp08_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp08-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp08-node2.doc
+dist_rtems_tests_DATA = mp08-node2.scn
+dist_rtems_tests_DATA += mp08-node2.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp09/node1/Makefile.am b/testsuites/mptests/mp09/node1/Makefile.am
index 4094154d95..19261173ac 100644
--- a/testsuites/mptests/mp09/node1/Makefile.am
+++ b/testsuites/mptests/mp09/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp message
 rtems_tests_PROGRAMS = mp09-node1.exe
 mp09_node1_exe_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp09-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp09-node1.doc
+dist_rtems_tests_DATA = mp09-node1.scn
+dist_rtems_tests_DATA += mp09-node1.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp09/node2/Makefile.am b/testsuites/mptests/mp09/node2/Makefile.am
index add1aabfbf..470ff5fe08 100644
--- a/testsuites/mptests/mp09/node2/Makefile.am
+++ b/testsuites/mptests/mp09/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp message
 rtems_tests_PROGRAMS = mp09-node2.exe
 mp09_node2_exe_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp09-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp09-node2.doc
+dist_rtems_tests_DATA = mp09-node2.scn
+dist_rtems_tests_DATA += mp09-node2.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp10/node1/Makefile.am b/testsuites/mptests/mp10/node1/Makefile.am
index c44f5dcc8e..8d130450ab 100644
--- a/testsuites/mptests/mp10/node1/Makefile.am
+++ b/testsuites/mptests/mp10/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp message semaphore
 rtems_tests_PROGRAMS = mp10-node1.exe
 mp10_node1_exe_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp10-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp10-node1.doc
+dist_rtems_tests_DATA = mp10-node1.scn
+dist_rtems_tests_DATA += mp10-node1.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp10/node2/Makefile.am b/testsuites/mptests/mp10/node2/Makefile.am
index 7577d92692..eb44d36d58 100644
--- a/testsuites/mptests/mp10/node2/Makefile.am
+++ b/testsuites/mptests/mp10/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp message semaphore
 rtems_tests_PROGRAMS = mp10-node2.exe
 mp10_node2_exe_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp10-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp10-node2.doc
+dist_rtems_tests_DATA = mp10-node2.scn
+dist_rtems_tests_DATA += mp10-node2.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp11/node1/Makefile.am b/testsuites/mptests/mp11/node1/Makefile.am
index c596d33ac2..26530853c0 100644
--- a/testsuites/mptests/mp11/node1/Makefile.am
+++ b/testsuites/mptests/mp11/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp message partition semaphore
 rtems_tests_PROGRAMS = mp11-node1.exe
 mp11_node1_exe_SOURCES = ../init.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp11-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp11-node1.doc
+dist_rtems_tests_DATA = mp11-node1.scn
+dist_rtems_tests_DATA += mp11-node1.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp11/node2/Makefile.am b/testsuites/mptests/mp11/node2/Makefile.am
index 56e0082b7f..b60c553dd6 100644
--- a/testsuites/mptests/mp11/node2/Makefile.am
+++ b/testsuites/mptests/mp11/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp message partition semaphore
 rtems_tests_PROGRAMS = mp11-node2.exe
 mp11_node2_exe_SOURCES = ../init.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp11-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp11-node2.doc
+dist_rtems_tests_DATA = mp11-node2.scn
+dist_rtems_tests_DATA += mp11-node2.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp12/node1/Makefile.am b/testsuites/mptests/mp12/node1/Makefile.am
index e5a8cd0272..8e3c237568 100644
--- a/testsuites/mptests/mp12/node1/Makefile.am
+++ b/testsuites/mptests/mp12/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp partition
 rtems_tests_PROGRAMS = mp12-node1.exe
 mp12_node1_exe_SOURCES = ../init.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp12-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp12-node1.doc
+dist_rtems_tests_DATA = mp12-node1.scn
+dist_rtems_tests_DATA += mp12-node1.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp12/node2/Makefile.am b/testsuites/mptests/mp12/node2/Makefile.am
index 67005171c1..8ba5b382ad 100644
--- a/testsuites/mptests/mp12/node2/Makefile.am
+++ b/testsuites/mptests/mp12/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp partition
 rtems_tests_PROGRAMS = mp12-node2.exe
 mp12_node2_exe_SOURCES = ../init.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp12-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp12-node2.doc
+dist_rtems_tests_DATA = mp12-node2.scn
+dist_rtems_tests_DATA += mp12-node2.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp13/node1/Makefile.am b/testsuites/mptests/mp13/node1/Makefile.am
index b3b96b58d3..b223970813 100644
--- a/testsuites/mptests/mp13/node1/Makefile.am
+++ b/testsuites/mptests/mp13/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp message semaphore
 rtems_tests_PROGRAMS = mp13-node1.exe
 mp13_node1_exe_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp13-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp13-node1.doc
+dist_rtems_tests_DATA = mp13-node1.scn
+dist_rtems_tests_DATA += mp13-node1.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp13/node2/Makefile.am b/testsuites/mptests/mp13/node2/Makefile.am
index e285e8f666..4cc9e083c1 100644
--- a/testsuites/mptests/mp13/node2/Makefile.am
+++ b/testsuites/mptests/mp13/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp message semaphore
 rtems_tests_PROGRAMS = mp13-node2.exe
 mp13_node2_exe_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp13-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp13-node2.doc
+dist_rtems_tests_DATA = mp13-node2.scn
+dist_rtems_tests_DATA += mp13-node2.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp14/node1/Makefile.am b/testsuites/mptests/mp14/node1/Makefile.am
index 29c06bf210..e2e1ff6511 100644
--- a/testsuites/mptests/mp14/node1/Makefile.am
+++ b/testsuites/mptests/mp14/node1/Makefile.am
@@ -8,10 +8,8 @@ rtems_tests_PROGRAMS = mp14-node1.exe
 mp14_node1_exe_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
     ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp14-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp14-node1.doc
+dist_rtems_tests_DATA = mp14-node1.scn
+dist_rtems_tests_DATA += mp14-node1.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp14/node2/Makefile.am b/testsuites/mptests/mp14/node2/Makefile.am
index 5a4ce979da..936f59042f 100644
--- a/testsuites/mptests/mp14/node2/Makefile.am
+++ b/testsuites/mptests/mp14/node2/Makefile.am
@@ -8,10 +8,8 @@ rtems_tests_PROGRAMS = mp14-node2.exe
 mp14_node2_exe_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
     ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp14-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp14-node2.doc
+dist_rtems_tests_DATA = mp14-node2.scn
+dist_rtems_tests_DATA += mp14-node2.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am