5 files changed, 79 insertions, 55 deletions
diff --git a/c/src/exec/posix/include/Makefile.in b/c/src/exec/posix/include/Makefile.in
index 38c5eb5cc0..68916a609a 100644
--- a/c/src/exec/posix/include/Makefile.in
+++ b/c/src/exec/posix/include/Makefile.in
@@ -5,21 +5,21 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../..
-subdir = c/src/exec/posix/include
+top_builddir = ../..
+subdir = posix/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 sys
+INSTALL_CHANGE = @INSTALL_CHANGE@
+
+SUB_DIRS = wrap rtems sys
 
-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/posix/include/rtems/Makefile.in b/c/src/exec/posix/include/rtems/Makefile.in
index d66f534bbd..5cb9c02f55 100644
--- a/c/src/exec/posix/include/rtems/Makefile.in
+++ b/c/src/exec/posix/include/rtems/Makefile.in
@@ -5,21 +5,21 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../../..
-subdir = c/src/exec/posix/include/rtems
+top_builddir = ../../..
+subdir = posix/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=posix
+INSTALL_CHANGE = @INSTALL_CHANGE@
+
+SUB_DIRS = posix
 
-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/posix/include/rtems/posix/Makefile.in b/c/src/exec/posix/include/rtems/posix/Makefile.in
index ccd0ce0b29..33d43cae10 100644
--- a/c/src/exec/posix/include/rtems/posix/Makefile.in
+++ b/c/src/exec/posix/include/rtems/posix/Makefile.in
@@ -5,32 +5,38 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../../../..
-subdir = c/src/exec/posix/include/rtems/posix
+top_builddir = ../../../..
+subdir = posix/include/rtems/posix
 
-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 = condmp mqueuemp mutexmp pthreadmp semaphoremp
-MP_PIECES = $(MP_PIECES_$(HAS_MP)_V)
+MP_H_PIECES_yes_V = condmp mqueuemp mutexmp pthreadmp semaphoremp
+MP_H_PIECES = $(MP_H_PIECES_$(HAS_MP)_V)
 
-H_PIECES= cancel cond config key mqueue mutex posixapi \
-    priority psignal pthread ptimer semaphore seterr threadsup time
+H_PIECES = cancel cond config key mqueue mutex posixapi priority psignal \
+    pthread ptimer semaphore seterr threadsup time $(MP_H_PIECES)
 #H_PIECES= cancel cond intr key mqueue mqueuemp mutex \
 #    mutexmp pthread pthreadmp priority semaphore semaphoremp threadsup \
 #    time
-H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
+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/posix
+
+$(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
@@ -41,9 +47,11 @@ include $(RTEMS_ROOT)/make/leaf.cfg
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-all:	$(SRCS)
-	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/posix
+preinstall: $(INSTALLDIRS) $(H_FILES)
+	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/posix
+
+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/posix/include/sys/Makefile.in b/c/src/exec/posix/include/sys/Makefile.in
index f42f77018b..6edfed655c 100644
--- a/c/src/exec/posix/include/sys/Makefile.in
+++ b/c/src/exec/posix/include/sys/Makefile.in
@@ -5,24 +5,30 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../../..
-subdir = c/src/exec/posix/include/sys
+top_builddir = ../../..
+subdir = posix/include/sys
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-H_PIECES=utsname
-H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
+H_PIECES = utsname
+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)/sys
+
+$(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)/sys
+all: preinstall
+
+preinstall: $(INSTALLDIRS) $(H_FILES)
+	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/sys
 
-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/posix/include/wrap/Makefile.in b/c/src/exec/posix/include/wrap/Makefile.in
index 634e30238c..2cb73d883a 100644
--- a/c/src/exec/posix/include/wrap/Makefile.in
+++ b/c/src/exec/posix/include/wrap/Makefile.in
@@ -5,26 +5,32 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../../..
-subdir = c/src/exec/posix/include/wrap
+top_builddir = ../../..
+subdir = posix/include/wrap
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
 # RTEMS unistd.h needs to be checked against newlib's and removed
 #H_PIECES= aio devctl intr mqueue semaphore
-H_PIECES= pthread sched aio mqueue semaphore
-H_FILES=$(H_PIECES:%=$(srcdir)/../%.h)
+H_PIECES = pthread sched aio mqueue semaphore
+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
@@ -35,9 +41,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