1 files changed, 20 insertions, 14 deletions
diff --git a/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.in b/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.in
index e1074923e5..a5add38e8b 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.in
@@ -9,35 +9,41 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../../../..
-subdir = c/src/lib/libcpu/powerpc/mpc860/include
+top_builddir = ../../../..
+subdir = libcpu/powerpc/mpc860/include
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
 H_FILES = $(srcdir)/mpc860.h
 MPC860_H_FILES = $(srcdir)/console.h
-SRCS=$(H_FILES) $(MPC860_H_FILES)
+SRCS = $(H_FILES) $(MPC860_H_FILES)
 
-include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
-all:	install
+INSTALL_CHANGE = @INSTALL_CHANGE@
+mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
+
+INSTALLDIRS = $(PROJECT_INCLUDE)/mpc860 $(PROJECT_INCLUDE)
+
+$(INSTALLDIRS):
+	@$(mkinstalldirs) $(INSTALLDIRS)
+
+all: install
 
 install: preinstall
 
-preinstall:
-	$(RTEMS_ROOT)/mkinstalldirs $(PROJECT_INCLUDE)/mpc860
-	$(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL_CHANGE) -m 444 $(MPC860_H_FILES) $(PROJECT_INCLUDE)/mpc860
+preinstall: 
+	$(mkinstalldirs) $(PROJECT_INCLUDE)/mpc860
+	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
+	@$(INSTALL_CHANGE) -m 644 $(MPC860_H_FILES) $(PROJECT_INCLUDE)/mpc860
 
 all: FORCEIT
-	cd ../../../../libbsp/$(RTEMS_CPU)/${RTEMS_BSP}/include; $(MAKE) all
+	cd ../../../../libbsp/$(RTEMS_CPU)/@RTEMS_BSP@/include; $(MAKE) all
 
-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