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/libmisc/assoc/Makefile.in | 4 +++- c/src/libmisc/cpuuse/Makefile.in | 4 +++- c/src/libmisc/dumpbuf/Makefile.in | 4 +++- c/src/libmisc/error/Makefile.in | 4 +++- c/src/libmisc/monitor/Makefile.in | 4 +++- c/src/libmisc/rtmonuse/Makefile.in | 4 +++- c/src/libmisc/stackchk/Makefile.in | 4 +++- c/src/libmisc/wrapup/Makefile.in | 2 ++ 8 files changed, 23 insertions(+), 7 deletions(-) (limited to 'c/src/libmisc') diff --git a/c/src/libmisc/assoc/Makefile.in b/c/src/libmisc/assoc/Makefile.in index a547bb6565..2a374b9d53 100644 --- a/c/src/libmisc/assoc/Makefile.in +++ b/c/src/libmisc/assoc/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + LIB=${ARCH}/libassoc-tmp.a # C source names, if any, go here -- minus the .c @@ -49,4 +51,4 @@ ${LIB}: ${SRCS} ${OBJS} $(make-library) all: ${ARCH} $(SRCS) $(LIB) - $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems + $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems diff --git a/c/src/libmisc/cpuuse/Makefile.in b/c/src/libmisc/cpuuse/Makefile.in index 87a8f82cf2..78c4db9d15 100644 --- a/c/src/libmisc/cpuuse/Makefile.in +++ b/c/src/libmisc/cpuuse/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + LIB=${ARCH}/libcpuuse-tmp.a # C source names, if any, go here -- minus the .c @@ -52,4 +54,4 @@ ${LIB}: ${SRCS} preinstall ${OBJS} all: ${ARCH} $(SRCS) preinstall $(LIB) preinstall: - $(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems + $(INSTALL_CHANGE) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems diff --git a/c/src/libmisc/dumpbuf/Makefile.in b/c/src/libmisc/dumpbuf/Makefile.in index 1b404e5557..07067a01fc 100644 --- a/c/src/libmisc/dumpbuf/Makefile.in +++ b/c/src/libmisc/dumpbuf/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + LIB=${ARCH}/libdumpbuf-tmp.a # C source names, if any, go here -- minus the .c @@ -52,4 +54,4 @@ ${LIB}: ${SRCS} preinstall ${OBJS} all: ${ARCH} $(SRCS) preinstall $(LIB) preinstall: - $(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems + $(INSTALL_CHANGE) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems diff --git a/c/src/libmisc/error/Makefile.in b/c/src/libmisc/error/Makefile.in index 5cc51de586..1303f271df 100644 --- a/c/src/libmisc/error/Makefile.in +++ b/c/src/libmisc/error/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + LIB=${ARCH}/liberror-tmp.a # C source names, if any, go here -- minus the .c @@ -49,4 +51,4 @@ ${LIB}: ${SRCS} ${OBJS} $(make-library) all: ${ARCH} $(SRCS) $(LIB) - $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems + $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems diff --git a/c/src/libmisc/monitor/Makefile.in b/c/src/libmisc/monitor/Makefile.in index 62fac8b2e7..4d18e519e9 100644 --- a/c/src/libmisc/monitor/Makefile.in +++ b/c/src/libmisc/monitor/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + LIB=${ARCH}/libmonitor-tmp.a # C source names, if any, go here -- minus the .c @@ -60,4 +62,4 @@ ${LIB}: ${SRCS} ${OBJS} all: preinstall ${ARCH} $(SRCS) $(LIB) preinstall: $(INSTALLED_H_FILES) - $(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems + $(INSTALL_CHANGE) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems diff --git a/c/src/libmisc/rtmonuse/Makefile.in b/c/src/libmisc/rtmonuse/Makefile.in index 157ab1068a..4d813d3ba5 100644 --- a/c/src/libmisc/rtmonuse/Makefile.in +++ b/c/src/libmisc/rtmonuse/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + LIB=${ARCH}/librtmonuse-tmp.a # C source names, if any, go here -- minus the .c @@ -52,4 +54,4 @@ ${LIB}: ${SRCS} preinstall ${OBJS} all: ${ARCH} $(SRCS) preinstall $(LIB) preinstall: - $(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems + $(INSTALL_CHANGE) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems diff --git a/c/src/libmisc/stackchk/Makefile.in b/c/src/libmisc/stackchk/Makefile.in index 5c364cbff0..82a5af77b2 100644 --- a/c/src/libmisc/stackchk/Makefile.in +++ b/c/src/libmisc/stackchk/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + LIB=${ARCH}/libstackchk-tmp.a # C source names, if any, go here -- minus the .c @@ -52,4 +54,4 @@ ${LIB}: ${SRCS} preinstall ${OBJS} all: ${ARCH} $(SRCS) $(LIB) preinstall: - $(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems + $(INSTALL_CHANGE) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems diff --git a/c/src/libmisc/wrapup/Makefile.in b/c/src/libmisc/wrapup/Makefile.in index 9a93b4632f..a3235de951 100644 --- a/c/src/libmisc/wrapup/Makefile.in +++ b/c/src/libmisc/wrapup/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + LIB=$(ARCH)/libmisc.a include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg -- cgit v1.2.3