From 8548fe0ae29eafea856090e742c1fd205ed4b0fb Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 18 Feb 1999 18:36:05 +0000 Subject: Part of the automake VI patch from Ralf Corsepius : > 5) rtems-rc-19990202-1.diff/reorg-install.sh > > reorg-install.sh fixes a Makefile variable name clash of RTEMS > configuration files and automake/autoconf standards. > Until now, RTEMS used $(INSTALL) for install-if-change. Automake and > autoconf use $(INSTALL) for a bsd-compatible install. As > install-if-change and bsd-install are not compatible, I renamed all > references to install-if-changed to $(INSTALL_CHANGED) and used > $(INSTALL) for bsd-install (==automake/autoconf standard). When > automake will be introduced install-if-change will probably be replaced > by $(INSTALL) and therefore will slowly vanish. For the moment, this > patch fixes a very nasty problem which prevents adding any automake file > until now (There are still more). --- c/src/lib/libcpu/i386/Makefile.in | 4 +++- c/src/lib/libcpu/i386/wrapup/Makefile.in | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'c/src/lib/libcpu/i386') diff --git a/c/src/lib/libcpu/i386/Makefile.in b/c/src/lib/libcpu/i386/Makefile.in index c380bed5c6..a4fa7e9f05 100644 --- a/c/src/lib/libcpu/i386/Makefile.in +++ b/c/src/lib/libcpu/i386/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + # C source names, if any, go here -- minus the .c C_PIECES=cpu displayCpu page @@ -56,7 +58,7 @@ ${LIB}: ${SRCS} ${OBJS} preinstall : $(MKDIR) $(PROJECT_INCLUDE)/libcpu - $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/libcpu + $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/libcpu all: ${ARCH} $(SRCS) preinstall $(OBJ) $(LIB) cd wrapup; $(MAKE) diff --git a/c/src/lib/libcpu/i386/wrapup/Makefile.in b/c/src/lib/libcpu/i386/wrapup/Makefile.in index c7406ebe0d..f0fdf1c7b7 100644 --- a/c/src/lib/libcpu/i386/wrapup/Makefile.in +++ b/c/src/lib/libcpu/i386/wrapup/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + BSP_PIECES=startup clock console timer GENERIC_PIECES= -- cgit v1.2.3