2 files changed, 20 insertions, 22 deletions
diff --git a/testsuites/mptests/mp09/node1/Makefile.am b/testsuites/mptests/mp09/node1/Makefile.am
index 5af4700b28..e5fcfcf088 100644
--- a/testsuites/mptests/mp09/node1/Makefile.am
+++ b/testsuites/mptests/mp09/node1/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 1
-PGM = $(ARCH)/mp09-node$(NODE).exe
+PGM = $(ARCH)/mp09-node1.exe
 
 MANAGERS = io mp message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
 
-DOCS = mp09-node$(NODE).doc mp09-node$(NODE).scn
+DOCS = mp09-node1.doc mp09-node1.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp09--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp09--node1.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
-	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node1/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node1
+	@: > $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp09-node$(NODE).scn: mp09-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node1/mp09-node1.scn: mp09-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp09--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp09-node$(NODE).scn
+$(project_bspdir)/tests/mp09--node1.exe \
+$(project_bspdir)/tests/screens/mptests/node1/mp09-node1.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp09/node2/Makefile.am b/testsuites/mptests/mp09/node2/Makefile.am
index 6f5d82ee49..2f9972e32e 100644
--- a/testsuites/mptests/mp09/node2/Makefile.am
+++ b/testsuites/mptests/mp09/node2/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 2
-PGM = $(ARCH)/mp09-node$(NODE).exe
+PGM = $(ARCH)/mp09-node2.exe
 
 MANAGERS = io mp message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
 
-DOCS = mp09-node$(NODE).doc mp09-node$(NODE).scn
+DOCS = mp09-node2.doc mp09-node2.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp09--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp09--node2.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
-	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node2/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node2
+	@: > $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp09-node$(NODE).scn: mp09-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node2/mp09-node2.scn: mp09-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp09--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp09-node$(NODE).scn
+$(project_bspdir)/tests/mp09--node2.exe \
+$(project_bspdir)/tests/screens/mptests/node2/mp09-node2.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 if HAS_MP