4 files changed, 28 insertions, 27 deletions
diff --git a/c/src/exec/rtems/include/Makefile.am b/c/src/exec/rtems/include/Makefile.am
index 11a9596ea1..8935b30100 100644
--- a/c/src/exec/rtems/include/Makefile.am
+++ b/c/src/exec/rtems/include/Makefile.am
@@ -4,11 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_PIECES = rtems.h
+H_FILES = rtems.h
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE) \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
@@ -17,9 +17,9 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-all-am: $(TMPINSTALL_FILES)
-debug-am: $(TMPINSTALL_FILES)
-profile-am: $(TMPINSTALL_FILES)
+all-am: $(PREINSTALL_FILES)
+debug-am: $(PREINSTALL_FILES)
+profile-am: $(PREINSTALL_FILES)
 
 SUBDIRS = rtems
 
diff --git a/c/src/exec/rtems/include/rtems/rtems/Makefile.am b/c/src/exec/rtems/include/rtems/rtems/Makefile.am
index 94667686bd..4afbdd0695 100644
--- a/c/src/exec/rtems/include/rtems/rtems/Makefile.am
+++ b/c/src/exec/rtems/include/rtems/rtems/Makefile.am
@@ -5,17 +5,18 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 ## We only build multiprocessing related files if HAS_MP was defined
-MP_H_PIECES_yes_V = eventmp.h mp.h msgmp.h partmp.h regionmp.h semmp.h \
+if HAS_MP
+MP_H_FILES = eventmp.h mp.h msgmp.h partmp.h regionmp.h semmp.h \
     signalmp.h taskmp.h
-MP_H_PIECES = $(MP_H_PIECES_$(HAS_MP)_V)
+endif
 
-H_PIECES = asr.h attr.h clock.h config.h dpmem.h event.h eventset.h intr.h \
+H_FILES = asr.h attr.h clock.h config.h dpmem.h event.h eventset.h intr.h \
     message.h modes.h options.h part.h ratemon.h region.h rtemsapi.h sem.h \
-    signal.h status.h support.h tasks.h timer.h types.h $(MP_H_PIECES)
+    signal.h status.h support.h tasks.h timer.h types.h $(MP_H_FILES)
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/rtems/rtems \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
 
@@ -24,8 +25,8 @@ $(PROJECT_INCLUDE)/rtems/rtems:
 $(PROJECT_INCLUDE)/rtems/rtems/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-all-am: $(TMPINSTALL_FILES)
-debug-am: $(TMPINSTALL_FILES)
-profile-am: $(TMPINSTALL_FILES)
+all-am: $(PREINSTALL_FILES)
+debug-am: $(PREINSTALL_FILES)
+profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/rtems/inline/rtems/rtems/Makefile.am b/c/src/exec/rtems/inline/rtems/rtems/Makefile.am
index b028bc6f39..44dde4db1b 100644
--- a/c/src/exec/rtems/inline/rtems/rtems/Makefile.am
+++ b/c/src/exec/rtems/inline/rtems/rtems/Makefile.am
@@ -5,13 +5,13 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 if INLINE
-I_PIECES = asr.inl attr.inl dpmem.inl event.inl eventset.inl message.inl \
+I_FILES = asr.inl attr.inl dpmem.inl event.inl eventset.inl message.inl \
     modes.inl options.inl part.inl ratemon.inl \
     region.inl sem.inl status.inl support.inl tasks.inl timer.inl
 
-noinst_HEADERS = $(I_PIECES)
+noinst_HEADERS = $(I_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/rtems/rtems \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
 
@@ -21,8 +21,8 @@ $(PROJECT_INCLUDE)/rtems/rtems/%.inl: %.inl
 	$(INSTALL_DATA) $< $@
 endif
 
-all-am: $(TMPINSTALL_FILES)
-debug-am: $(TMPINSTALL_FILES)
-profile-am: $(TMPINSTALL_FILES)
+all-am: $(PREINSTALL_FILES)
+debug-am: $(PREINSTALL_FILES)
+profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/rtems/macros/rtems/rtems/Makefile.am b/c/src/exec/rtems/macros/rtems/rtems/Makefile.am
index 140cb794d6..f738254bfc 100644
--- a/c/src/exec/rtems/macros/rtems/rtems/Makefile.am
+++ b/c/src/exec/rtems/macros/rtems/rtems/Makefile.am
@@ -5,13 +5,13 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 if MACROS
-I_PIECES = asr.inl attr.inl dpmem.inl event.inl eventset.inl message.inl \
+I_FILES = asr.inl attr.inl dpmem.inl event.inl eventset.inl message.inl \
     modes.inl options.inl part.inl ratemon.inl \
     region.inl sem.inl status.inl support.inl tasks.inl timer.inl
 
-noinst_HEADERS = $(I_PIECES)
+noinst_HEADERS = $(I_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/rtems/rtems \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
 
@@ -21,8 +21,8 @@ $(PROJECT_INCLUDE)/rtems/rtems/%.inl: %.inl
 	$(INSTALL_DATA) $< $@
 endif
 
-all-am: $(TMPINSTALL_FILES)
-debug-am: $(TMPINSTALL_FILES)
-profile-am: $(TMPINSTALL_FILES)
+all-am: $(PREINSTALL_FILES)
+debug-am: $(PREINSTALL_FILES)
+profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am