13 files changed, 219 insertions, 191 deletions
diff --git a/c/src/exec/rtems/Makefile.in b/c/src/exec/rtems/Makefile.in
index 4e814be59f..bc90b24a39 100644
--- a/c/src/exec/rtems/Makefile.in
+++ b/c/src/exec/rtems/Makefile.in
@@ -5,21 +5,30 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = c/src/exec/rtems
+top_builddir = ..
+subdir = rtems
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
-SUB_DIRS=include $(INLINE) optman src
+INSTALL_CHANGE = @INSTALL_CHANGE@
+mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
+
+INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/rtems
+
+$(INSTALLDIRS):
+	@$(mkinstalldirs) $(INSTALLDIRS)
+
+SUB_DIRS = include $(INLINE) optman src
+
+preinstall: 
+	$(mkinstalldirs) $(INSTALLDIRS)
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/rtems/include/Makefile.in b/c/src/exec/rtems/include/Makefile.in
index 3fe8c3e185..9919d92014 100644
--- a/c/src/exec/rtems/include/Makefile.in
+++ b/c/src/exec/rtems/include/Makefile.in
@@ -5,21 +5,21 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../..
-subdir = c/src/exec/rtems/include
+top_builddir = ../..
+subdir = rtems/include
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
-SUB_DIRS=wrap rtems
+INSTALL_CHANGE = @INSTALL_CHANGE@
+
+SUB_DIRS = wrap rtems
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/rtems/include/rtems/Makefile.in b/c/src/exec/rtems/include/rtems/Makefile.in
index 537ef76931..30201e5942 100644
--- a/c/src/exec/rtems/include/rtems/Makefile.in
+++ b/c/src/exec/rtems/include/rtems/Makefile.in
@@ -5,21 +5,21 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../../..
-subdir = c/src/exec/rtems/include/rtems
+top_builddir = ../../..
+subdir = rtems/include/rtems
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
-SUB_DIRS=rtems
+INSTALL_CHANGE = @INSTALL_CHANGE@
+
+SUB_DIRS = rtems
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/rtems/include/rtems/rtems/Makefile.in b/c/src/exec/rtems/include/rtems/rtems/Makefile.in
index ac4298e659..a1f93027e7 100644
--- a/c/src/exec/rtems/include/rtems/rtems/Makefile.in
+++ b/c/src/exec/rtems/include/rtems/rtems/Makefile.in
@@ -5,31 +5,36 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../../../..
-subdir = c/src/exec/rtems/include/rtems/rtems
+top_builddir = ../../../..
+subdir = rtems/include/rtems/rtems
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
 # We only build multiprocessing related files if HAS_MP was defined
-MP_PIECES_yes_V = eventmp mp msgmp partmp regionmp semmp signalmp taskmp
-MP_PIECES = $(MP_PIECES_$(HAS_MP)_V)
+MP_H_PIECES_yes_V = eventmp mp msgmp partmp regionmp semmp signalmp taskmp
+MP_H_PIECES = $(MP_H_PIECES_$(HAS_MP)_V)
 
-H_PIECES=asr attr clock config dpmem event eventset \
-   intr message modes options part \
-   ratemon region rtemsapi sem signal status \
-   support tasks timer types $(MP_PIECES)
-H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
+H_PIECES = asr attr clock config dpmem event eventset intr message modes \
+    options part ratemon region rtemsapi sem signal status support tasks \
+    timer types $(MP_H_PIECES)
+H_FILES = $(H_PIECES:%=$(srcdir)/%.h)
 
-SRCS=$(H_FILES)
+SRCS = $(H_FILES)
 
-include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
+INSTALL_CHANGE = @INSTALL_CHANGE@
+mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
+
+INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/rtems
+
+$(INSTALLDIRS):
+	@$(mkinstalldirs) $(INSTALLDIRS)
+
 #
 # Add your list of files to delete here.  The config files
 #  already know how to delete some stuff, so you may want
@@ -40,9 +45,11 @@ include $(RTEMS_ROOT)/make/leaf.cfg
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-all:	$(SRCS)
-	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/rtems
+preinstall: $(INSTALLDIRS) $(H_FILES)
+	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/rtems
+
+all: preinstall
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/rtems/include/wrap/Makefile.in b/c/src/exec/rtems/include/wrap/Makefile.in
index 52857c7307..bd613c36d4 100644
--- a/c/src/exec/rtems/include/wrap/Makefile.in
+++ b/c/src/exec/rtems/include/wrap/Makefile.in
@@ -5,24 +5,30 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../../..
-subdir = c/src/exec/rtems/include/wrap
+top_builddir = ../../..
+subdir = rtems/include/wrap
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-H_PIECES=rtems
-H_FILES=$(H_PIECES:%=$(srcdir)/../%.h)
+H_PIECES = rtems
+H_FILES = $(H_PIECES:%=$(srcdir)/../%.h)
 
-SRCS=$(H_FILES)
+SRCS = $(H_FILES)
 
-include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
+INSTALL_CHANGE = @INSTALL_CHANGE@
+mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
+
+INSTALLDIRS = $(PROJECT_INCLUDE)
+
+$(INSTALLDIRS):
+	@$(mkinstalldirs) $(INSTALLDIRS)
+
 #
 # Add your list of files to delete here.  The config files
 #  already know how to delete some stuff, so you may want
@@ -33,9 +39,11 @@ include $(RTEMS_ROOT)/make/leaf.cfg
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-all:	$(SRCS)
-	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
+all: preinstall
+
+preinstall: $(INSTALLDIRS) $(H_FILES)
+	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/rtems/inline/Makefile.in b/c/src/exec/rtems/inline/Makefile.in
index f3cd6c8507..8fb24d9f5b 100644
--- a/c/src/exec/rtems/inline/Makefile.in
+++ b/c/src/exec/rtems/inline/Makefile.in
@@ -5,21 +5,21 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../..
-subdir = c/src/exec/rtems/inline
+top_builddir = ../..
+subdir = rtems/inline
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
-SUB_DIRS=rtems
+INSTALL_CHANGE = @INSTALL_CHANGE@
+
+SUB_DIRS = rtems
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/rtems/inline/rtems/Makefile.in b/c/src/exec/rtems/inline/rtems/Makefile.in
index 1e12c0ef05..c2efbeca1e 100644
--- a/c/src/exec/rtems/inline/rtems/Makefile.in
+++ b/c/src/exec/rtems/inline/rtems/Makefile.in
@@ -5,21 +5,21 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../../..
-subdir = c/src/exec/rtems/inline/rtems
+top_builddir = ../../..
+subdir = rtems/inline/rtems
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
-SUB_DIRS=rtems
+INSTALL_CHANGE = @INSTALL_CHANGE@
+
+SUB_DIRS = rtems
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/rtems/inline/rtems/rtems/Makefile.in b/c/src/exec/rtems/inline/rtems/rtems/Makefile.in
index f3b56f9330..fff81d3c22 100644
--- a/c/src/exec/rtems/inline/rtems/rtems/Makefile.in
+++ b/c/src/exec/rtems/inline/rtems/rtems/Makefile.in
@@ -5,25 +5,31 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../../../..
-subdir = c/src/exec/rtems/inline/rtems/rtems
+top_builddir = ../../../..
+subdir = rtems/inline/rtems/rtems
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-I_PIECES=asr attr dpmem event eventset message modes options \
-   part ratemon region sem status support tasks timer
-I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
+I_PIECES = asr attr dpmem event eventset message modes options part ratemon \
+    region sem status support tasks timer
+I_FILES = $(I_PIECES:%=$(srcdir)/%.inl)
 
-SRCS=$(I_FILES)
+SRCS = $(I_FILES)
 
-include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
+INSTALL_CHANGE = @INSTALL_CHANGE@
+mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
+
+INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/rtems
+
+$(INSTALLDIRS):
+	@$(mkinstalldirs) $(INSTALLDIRS)
+
 #
 # Add your list of files to delete here.  The config files
 #  already know how to delete some stuff, so you may want
@@ -34,9 +40,11 @@ include $(RTEMS_ROOT)/make/lib.cfg
 CLEAN_ADDITIONS += $(LIB)
 CLOBBER_ADDITIONS +=
 
-all:	$(SRCS)
-	$(INSTALL_CHANGE) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/rtems
+all: preinstall
+
+preinstall: $(INSTALLDIRS) $(I_FILES)
+	@$(INSTALL_CHANGE) -m 644 $(I_FILES) $(PROJECT_INCLUDE)/rtems/rtems
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/rtems/macros/Makefile.in b/c/src/exec/rtems/macros/Makefile.in
index 5071720358..0488c6d862 100644
--- a/c/src/exec/rtems/macros/Makefile.in
+++ b/c/src/exec/rtems/macros/Makefile.in
@@ -5,21 +5,21 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../..
-subdir = c/src/exec/rtems/macros
+top_builddir = ../..
+subdir = rtems/macros
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
-SUB_DIRS=rtems
+INSTALL_CHANGE = @INSTALL_CHANGE@
+
+SUB_DIRS = rtems
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/rtems/macros/rtems/Makefile.in b/c/src/exec/rtems/macros/rtems/Makefile.in
index cb3b0ce2b5..98bd4b4c80 100644
--- a/c/src/exec/rtems/macros/rtems/Makefile.in
+++ b/c/src/exec/rtems/macros/rtems/Makefile.in
@@ -5,21 +5,21 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../../..
-subdir = c/src/exec/rtems/macros/rtems
+top_builddir = ../../..
+subdir = rtems/macros/rtems
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
-SUB_DIRS=rtems
+INSTALL_CHANGE = @INSTALL_CHANGE@
+
+SUB_DIRS = rtems
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/rtems/macros/rtems/rtems/Makefile.in b/c/src/exec/rtems/macros/rtems/rtems/Makefile.in
index 6ff1b2bc9c..14604b688d 100644
--- a/c/src/exec/rtems/macros/rtems/rtems/Makefile.in
+++ b/c/src/exec/rtems/macros/rtems/rtems/Makefile.in
@@ -5,25 +5,31 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../../../..
-subdir = c/src/exec/rtems/macros/rtems/rtems
+top_builddir = ../../../..
+subdir = rtems/macros/rtems/rtems
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-I_PIECES=asr attr dpmem event eventset message modes options \
-   part ratemon region sem status support tasks timer
-I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
+I_PIECES = asr attr dpmem event eventset message modes options part ratemon \
+    region sem status support tasks timer
+I_FILES = $(I_PIECES:%=$(srcdir)/%.inl)
 
-SRCS=$(I_FILES)
+SRCS = $(I_FILES)
 
-include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
+INSTALL_CHANGE = @INSTALL_CHANGE@
+mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
+
+INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/rtems
+
+$(INSTALLDIRS):
+	@$(mkinstalldirs) $(INSTALLDIRS)
+
 #
 # Add your list of files to delete here.  The config files
 #  already know how to delete some stuff, so you may want
@@ -34,9 +40,11 @@ include $(RTEMS_ROOT)/make/lib.cfg
 CLEAN_ADDITIONS += $(LIB)
 CLOBBER_ADDITIONS +=
 
-all:	$(SRCS)
-	$(INSTALL_CHANGE) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/rtems
+all: preinstall
+
+preinstall: $(INSTALLDIRS) $(I_FILES)
+	@$(INSTALL_CHANGE) -m 644 $(I_FILES) $(PROJECT_INCLUDE)/rtems/rtems
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/rtems/optman/Makefile.in b/c/src/exec/rtems/optman/Makefile.in
index d47fccf0ac..ce74d73596 100644
--- a/c/src/exec/rtems/optman/Makefile.in
+++ b/c/src/exec/rtems/optman/Makefile.in
@@ -5,43 +5,43 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../..
-subdir = c/src/exec/rtems/optman
+top_builddir = ../..
+subdir = rtems/optman
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-C_FILES= no-dpmem.c no-event.c no-msg.c no-mp.c \
-         no-part.c no-region.c no-rtmon.c no-sem.c no-signal.c no-timer.c
+C_FILES = no-dpmem.c no-event.c no-msg.c no-mp.c no-part.c no-region.c \
+    no-rtmon.c no-sem.c no-signal.c no-timer.c
 
-S_FILES=
+S_FILES =
 
-H_FILES=
+H_FILES =
 
-SRCS=$(C_FILES) $(CC_FILES) $(H_FILES)
-OBJS=$(C_O_FILES) $(CC_O_FILES)
+SRCS = $(C_FILES) $(CC_FILES) $(H_FILES)
+OBJS = $(C_O_FILES) $(CC_O_FILES)
 
-PGMS=$(C_FILES:%.c=$(ARCH)/%.rel)
+PGMS = $(C_FILES:%.c=$(ARCH)/%.rel)
 
-include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
+INSTALL_CHANGE = @INSTALL_CHANGE@
+
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-DEFINES  +=
+DEFINES +=
 CPPFLAGS +=
-CFLAGS   += $(CFLAGS_OS_V)
+CFLAGS += $(CFLAGS_OS_V)
 
-ASM4FLAGS += -I $(PROJECT_INCLUDE)/rtems
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
+ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems
+LD_PATHS +=
+LD_LIBS +=
+LDFLAGS +=
 
 #
 # Add your list of files to delete here.  The config files
@@ -53,9 +53,9 @@ LDFLAGS   +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-all:	${ARCH} $(SRCS) $(OBJS) $(PGMS)
-	$(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib
+all: ${ARCH} $(SRCS) $(OBJS) $(PGMS)
+	$(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/rtems/src/Makefile.in b/c/src/exec/rtems/src/Makefile.in
index b04af25553..496ea7e48c 100644
--- a/c/src/exec/rtems/src/Makefile.in
+++ b/c/src/exec/rtems/src/Makefile.in
@@ -5,89 +5,77 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../..
-subdir = c/src/exec/rtems/src
+top_builddir = ../..
+subdir = rtems/src
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
 # We only build multiprocessing related files if HAS_MP was defined
-MP_PIECES_yes_V = eventmp mp msgmp partmp regionmp semmp signalmp taskmp
-MP_PIECES = $(MP_PIECES_$(HAS_MP)_V)
+MP_C_PIECES_yes_V = eventmp mp msgmp partmp regionmp semmp signalmp taskmp
+MP_C_PIECES = $(MP_C_PIECES_$(HAS_MP)_V)
 
-TASK_PIECES=\
-  tasks taskcreate taskdelete taskgetnote taskident taskinitusers \
-  taskmode taskrestart taskresume tasksetnote tasksetpriority \
-  taskstart tasksuspend taskwakeafter taskwakewhen
+TASK_C_PIECES = tasks taskcreate taskdelete taskgetnote taskident \
+    taskinitusers taskmode taskrestart taskresume tasksetnote \
+    tasksetpriority taskstart tasksuspend taskwakeafter taskwakewhen
 
-RATEMON_PIECES=\
-  ratemon ratemoncancel ratemoncreate ratemondelete ratemongetstatus \
-  ratemonident ratemonperiod ratemontimeout
+RATEMON_C_PIECES = ratemon ratemoncancel ratemoncreate ratemondelete \
+    ratemongetstatus ratemonident ratemonperiod ratemontimeout
 
-INTR_PIECES=\
-  intr intrbody intrcatch
+INTR_C_PIECES = intr intrbody intrcatch
 
-CLOCK_PIECES=\
-  rtclock clockget clockset clocktick
+CLOCK_C_PIECES = rtclock clockget clockset clocktick
 
-TIMER_PIECES=\
-  rtemstimer timercancel timercreate timerdelete timerfireafter \
-  timerfirewhen timerident timerreset
+TIMER_C_PIECES = rtemstimer timercancel timercreate timerdelete \
+    timerfireafter timerfirewhen timerident timerreset
 
-MESSAGE_QUEUE_PIECES=\
-  msg msgqallocate msgqbroadcast msgqcreate msgqdelete \
-  msgqflush msgqgetnumberpending msgqident msgqreceive \
-  msgqsend msgqsubmit msgqtranslatereturncode msgqurgent
+MESSAGE_QUEUE_C_PIECES = msg msgqallocate msgqbroadcast msgqcreate \
+    msgqdelete msgqflush msgqgetnumberpending msgqident msgqreceive msgqsend \
+    msgqsubmit msgqtranslatereturncode msgqurgent
 
-SEMAPHORE_PIECES=\
-  sem semcreate semdelete semident semobtain semrelease \
-  semtranslatereturncode
+SEMAPHORE_C_PIECES = sem semcreate semdelete semident semobtain semrelease \
+    semtranslatereturncode
 
-EVENT_PIECES=\
-  event eventreceive eventseize eventsend eventsurrender eventtimeout
+EVENT_C_PIECES = event eventreceive eventseize eventsend eventsurrender \
+    eventtimeout
 
-SIGNAL_PIECES=\
-  signal signalcatch signalsend
+SIGNAL_C_PIECES = signal signalcatch signalsend
 
-REGION_PIECES=\
-  region regioncreate regiondelete regionextend regiongetsegment \
-  regiongetsegmentsize regionident regionreturnsegment regionreturnsegment
+REGION_C_PIECES = region regioncreate regiondelete regionextend \
+    regiongetsegment regiongetsegmentsize regionident regionreturnsegment \
+    regionreturnsegment
 
-PARTITION_PIECES=\
-  part partcreate partdelete partgetbuffer partident partreturnbuffer
+PARTITION_C_PIECES = part partcreate partdelete partgetbuffer partident \
+    partreturnbuffer
 
-DPMEM_PIECES=\
-  dpmem dpmemcreate dpmemdelete dpmemexternal2internal \
-  dpmemident dpmeminternal2external
+DPMEM_C_PIECES = dpmem dpmemcreate dpmemdelete dpmemexternal2internal \
+    dpmemident dpmeminternal2external
 
-C_PIECES=\
-  attr $(TASK_PIECES) $(RATEMON_PIECES) \
-  $(INTR_PIECES) \
-  $(CLOCK_PIECES) $(TIMER_PIECES) \
-  $(SEMAPHORE_PIECES) $(MESSAGE_QUEUE_PIECES) \
-  $(EVENT_PIECES) $(SIGNAL_PIECES) \
-  $(PARTITION_PIECES) $(REGION_PIECES) $(DPMEM_PIECES) \
-  $(MP_PIECES)
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
+C_PIECES = attr $(TASK_C_PIECES) $(RATEMON_C_PIECES) $(INTR_C_PIECES) \
+    $(CLOCK_C_PIECES) $(TIMER_C_PIECES) $(SEMAPHORE_C_PIECES) \
+    $(MESSAGE_QUEUE_C_PIECES) $(EVENT_C_PIECES) $(SIGNAL_C_PIECES) \
+    $(PARTITION_C_PIECES) $(REGION_C_PIECES) $(DPMEM_C_PIECES) \
+    $(MP_C_PIECES)
+C_FILES = $(C_PIECES:%=%.c)
+C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 
-SRCS=$(C_FILES)
-OBJS=$(C_O_FILES)
+SRCS = $(C_FILES)
+OBJS = $(C_O_FILES)
 
-include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
+INSTALL_CHANGE = @INSTALL_CHANGE@
+
 #
 # Add local stuff here using +=
 #
 
-DEFINES  += -D__RTEMS_INSIDE__
+DEFINES += -D__RTEMS_INSIDE__
 CPPFLAGS +=
-CFLAGS   += $(CFLAGS_OS_V)
+CFLAGS += $(CFLAGS_OS_V)
 
 #
 # Add your list of files to delete here.  The config files
@@ -96,11 +84,11 @@ CFLAGS   += $(CFLAGS_OS_V)
 #  'make clobber' already includes 'make clean'
 #
 
-CLEAN_ADDITIONS += 
+CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-all:	${ARCH} $(SRCS) ${OBJS}
+all: ${ARCH} $(SRCS) ${OBJS}
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status