Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

The patch below fixes a nasty bug in acpolish, which has broken many Makefile.ins below c/src/tests/ APPLYING THE PATCH: patch -p1 < rtems-rc-19990709-5.diff The essential part of this patch is the diff-fragment for acpolish contained in this patch. Ie. if any of the other diffs do not apply, make sure that the acpolish diff was applied correctly and then run cd <srcdir> tools/update/rtems-polish.sh -ac
1999-08-02 15:40:27 +00:00
parent fdb37e81ec
commit ae2ddb8103
74 changed files with 99 additions and 102 deletions
--- a/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in
@@ -25,7 +25,7 @@ include $(RTEMS_ROOT)/make/leaf.cfg
 INSTALL_CHANGE = @INSTALL_CHANGE@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_INCLUDE)/bsp.h
+INSTALLDIRS = $(PROJECT_INCLUDE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp01/node1/Makefile.in
+++ b/c/src/tests/mptests/mp01/node1/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp01/node2/Makefile.in
+++ b/c/src/tests/mptests/mp01/node2/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp02/node1/Makefile.in
+++ b/c/src/tests/mptests/mp02/node1/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp02/node2/Makefile.in
+++ b/c/src/tests/mptests/mp02/node2/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp03/node1/Makefile.in
+++ b/c/src/tests/mptests/mp03/node1/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp03/node2/Makefile.in
+++ b/c/src/tests/mptests/mp03/node2/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp04/node1/Makefile.in
+++ b/c/src/tests/mptests/mp04/node1/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp04/node2/Makefile.in
+++ b/c/src/tests/mptests/mp04/node2/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp05/node1/Makefile.in
+++ b/c/src/tests/mptests/mp05/node1/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp05/node2/Makefile.in
+++ b/c/src/tests/mptests/mp05/node2/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp06/node1/Makefile.in
+++ b/c/src/tests/mptests/mp06/node1/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp06/node2/Makefile.in
+++ b/c/src/tests/mptests/mp06/node2/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp07/node1/Makefile.in
+++ b/c/src/tests/mptests/mp07/node1/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp07/node2/Makefile.in
+++ b/c/src/tests/mptests/mp07/node2/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp08/node1/Makefile.in
+++ b/c/src/tests/mptests/mp08/node1/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp08/node2/Makefile.in
+++ b/c/src/tests/mptests/mp08/node2/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp09/node1/Makefile.in
+++ b/c/src/tests/mptests/mp09/node1/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp09/node2/Makefile.in
+++ b/c/src/tests/mptests/mp09/node2/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp10/node1/Makefile.in
+++ b/c/src/tests/mptests/mp10/node1/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp10/node2/Makefile.in
+++ b/c/src/tests/mptests/mp10/node2/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp11/node1/Makefile.in
+++ b/c/src/tests/mptests/mp11/node1/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp11/node2/Makefile.in
+++ b/c/src/tests/mptests/mp11/node2/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp12/node1/Makefile.in
+++ b/c/src/tests/mptests/mp12/node1/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp12/node2/Makefile.in
+++ b/c/src/tests/mptests/mp12/node2/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp13/node1/Makefile.in
+++ b/c/src/tests/mptests/mp13/node1/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp13/node2/Makefile.in
+++ b/c/src/tests/mptests/mp13/node2/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp14/node1/Makefile.in
+++ b/c/src/tests/mptests/mp14/node1/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/mptests/mp14/node2/Makefile.in
+++ b/c/src/tests/mptests/mp14/node2/Makefile.in
@@ -41,8 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = \
-    $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psx01/Makefile.in
+++ b/c/src/tests/psxtests/psx01/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psx02/Makefile.in
+++ b/c/src/tests/psxtests/psx02/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psx03/Makefile.in
+++ b/c/src/tests/psxtests/psx03/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psx04/Makefile.in
+++ b/c/src/tests/psxtests/psx04/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psx05/Makefile.in
+++ b/c/src/tests/psxtests/psx05/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psx06/Makefile.in
+++ b/c/src/tests/psxtests/psx06/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psx07/Makefile.in
+++ b/c/src/tests/psxtests/psx07/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psx08/Makefile.in
+++ b/c/src/tests/psxtests/psx08/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psx09/Makefile.in
+++ b/c/src/tests/psxtests/psx09/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psx10/Makefile.in
+++ b/c/src/tests/psxtests/psx10/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psx11/Makefile.in
+++ b/c/src/tests/psxtests/psx11/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psx12/Makefile.in
+++ b/c/src/tests/psxtests/psx12/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psx13/Makefile.in
+++ b/c/src/tests/psxtests/psx13/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psxfile01/Makefile.in
+++ b/c/src/tests/psxtests/psxfile01/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psxfile02/Makefile.in
+++ b/c/src/tests/psxtests/psxfile02/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psxmount/Makefile.in
+++ b/c/src/tests/psxtests/psxmount/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psxreaddir/Makefile.in
+++ b/c/src/tests/psxtests/psxreaddir/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psxstat/Makefile.in
+++ b/c/src/tests/psxtests/psxstat/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psxtime/Makefile.in
+++ b/c/src/tests/psxtests/psxtime/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/psxtests/psxtimer/Makefile.in
+++ b/c/src/tests/psxtests/psxtimer/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/psxtests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp01/Makefile.in
+++ b/c/src/tests/sptests/sp01/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp02/Makefile.in
+++ b/c/src/tests/sptests/sp02/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp03/Makefile.in
+++ b/c/src/tests/sptests/sp03/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp04/Makefile.in
+++ b/c/src/tests/sptests/sp04/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp05/Makefile.in
+++ b/c/src/tests/sptests/sp05/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp06/Makefile.in
+++ b/c/src/tests/sptests/sp06/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp07/Makefile.in
+++ b/c/src/tests/sptests/sp07/Makefile.in
@@ -42,7 +42,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp08/Makefile.in
+++ b/c/src/tests/sptests/sp08/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp09/Makefile.in
+++ b/c/src/tests/sptests/sp09/Makefile.in
@@ -44,7 +44,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp11/Makefile.in
+++ b/c/src/tests/sptests/sp11/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp12/Makefile.in
+++ b/c/src/tests/sptests/sp12/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp13/Makefile.in
+++ b/c/src/tests/sptests/sp13/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp14/Makefile.in
+++ b/c/src/tests/sptests/sp14/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp15/Makefile.in
+++ b/c/src/tests/sptests/sp15/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp16/Makefile.in
+++ b/c/src/tests/sptests/sp16/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp17/Makefile.in
+++ b/c/src/tests/sptests/sp17/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp19/Makefile.in
+++ b/c/src/tests/sptests/sp19/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp20/Makefile.in
+++ b/c/src/tests/sptests/sp20/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp21/Makefile.in
+++ b/c/src/tests/sptests/sp21/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp22/Makefile.in
+++ b/c/src/tests/sptests/sp22/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp23/Makefile.in
+++ b/c/src/tests/sptests/sp23/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp24/Makefile.in
+++ b/c/src/tests/sptests/sp24/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/sp25/Makefile.in
+++ b/c/src/tests/sptests/sp25/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
--- a/c/src/tests/sptests/spfatal/Makefile.in
+++ b/c/src/tests/sptests/spfatal/Makefile.in
@@ -41,7 +41,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 PACKHEX = @PACKHEX@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs

-INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests//$(TEST).scn
+INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/sptests

 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
@@ -71,7 +71,7 @@ CLOBBER_ADDITIONS +=
 all: ${ARCH} $(SRCS) $(PGM)
 	$(INSTALL_VARIANT) -m 755 ${PGM} $(PROJECT_RELEASE)/tests
 	$(INSTALL_CHANGE) $(srcdir)/$(TEST).scn \
-	    $(PROJECT_RELEASE)/tests/screens/sptests//$(TEST).scn
+	    $(PROJECT_RELEASE)/tests/screens/sptests/$(TEST).scn

 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
--- a/tools/update/acpolish
+++ b/tools/update/acpolish
@@ -251,8 +251,14 @@ sub subst_line
        {
          push @installdirs, "$1" ;
        }
+        elsif ( /^.*\$\(INSTALL_CHANGE\).*\s([^\s]+)(\/[^\.\s]+\.[^\s\/]+)$/o )
+        {
+#            print STDERR "WARNING - DIR1: $1 <$2> " ;
+            push @installdirs, "$1" ; 
+        }
        elsif ( /^.*\$\(INSTALL_CHANGE\).*\s([^\s]+)$/o )
        {
+#          print STDERR "DIR2 $1\n" ;
          push @installdirs, "$1" ;
        }
      }
@@ -441,6 +447,11 @@ sub subst_line
      # Most of them are removed, but we still have some :-
      push @tbuf, "$1 $2\n" ;
    }
+    elsif ( /^\@.*_(TRUE|FALSE)\@.*$/o )
+    { # automake conditionals
+      # HACK: Don't know how to handle them, so let's pass them through
+      push @tbuf, "$_" ;
+    }
    elsif ( /^[\s]*([^:]+)[\s]*(:[:]*)[\s]*(.*)$/o )
    {
      if ( "$2" eq "::" )
@@ -482,6 +493,20 @@ sub subst_line
    }
  }
  @buffer = @tbuf ;
+  @tbuf = @installdirs ;
+  @installdirs = () ;
+  foreach ( @tbuf )
+  {
+    if ( /^([^\s]+)(\/[^\.\s]+\.[^\s\/]+)$/o )
+    {
+       print STDERR "WARNING - stripping of file: $1 <$2> " if ( $verbose > 1 );
+       push @installdirs, "$1" ; 
+    }
+    else
+    {
+       push @installdirs, "$_" ;
+    }
+  }
  purge \@installdirs ;
  purge \@pieces ;
 }