diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-02-18 18:36:05 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-02-18 18:36:05 +0000 |
commit | 8548fe0ae29eafea856090e742c1fd205ed4b0fb (patch) | |
tree | b0f3515dadfdea2a2e12a587ea5a2adaab2229db /c/src/lib/libchip | |
parent | Part of the automake VI patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>: (diff) | |
download | rtems-8548fe0ae29eafea856090e742c1fd205ed4b0fb.tar.bz2 |
Part of the automake VI patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
> 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).
Diffstat (limited to 'c/src/lib/libchip')
-rw-r--r-- | c/src/lib/libchip/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libchip/network/Makefile.in | 6 | ||||
-rw-r--r-- | c/src/lib/libchip/rtc/Makefile.in | 6 | ||||
-rw-r--r-- | c/src/lib/libchip/serial/Makefile.in | 6 |
4 files changed, 14 insertions, 6 deletions
diff --git a/c/src/lib/libchip/Makefile.in b/c/src/lib/libchip/Makefile.in index c1d0ffb462..05c864aba1 100644 --- a/c/src/lib/libchip/Makefile.in +++ b/c/src/lib/libchip/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/directory.cfg diff --git a/c/src/lib/libchip/network/Makefile.in b/c/src/lib/libchip/network/Makefile.in index aaaf460aa1..2328b53a4e 100644 --- a/c/src/lib/libchip/network/Makefile.in +++ b/c/src/lib/libchip/network/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + LIBNAME=libnetchip.a LIB=${ARCH}/${LIBNAME} @@ -50,8 +52,8 @@ $(LIB): $(SRCS) ${OBJS} $(make-library) # Install the library, appending _g or _p as appropriate. -# for include files, just use $(INSTALL) +# for include files, just use $(INSTALL_CHANGE) preinstall: - $(INSTALL) -m 444 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/libchip + $(INSTALL_CHANGE) -m 444 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/libchip diff --git a/c/src/lib/libchip/rtc/Makefile.in b/c/src/lib/libchip/rtc/Makefile.in index 724a1af380..f988e75bfc 100644 --- a/c/src/lib/libchip/rtc/Makefile.in +++ b/c/src/lib/libchip/rtc/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + LIBNAME=librtcio.a LIB=${ARCH}/${LIBNAME} @@ -53,8 +55,8 @@ $(LIB): $(SRCS) ${OBJS} $(make-library) # Install the library, appending _g or _p as appropriate. -# for include files, just use $(INSTALL) +# for include files, just use $(INSTALL_CHANGE) preinstall: - $(INSTALL) -m 444 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/libchip + $(INSTALL_CHANGE) -m 444 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/libchip diff --git a/c/src/lib/libchip/serial/Makefile.in b/c/src/lib/libchip/serial/Makefile.in index d9c78faf97..c091bbb747 100644 --- a/c/src/lib/libchip/serial/Makefile.in +++ b/c/src/lib/libchip/serial/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + LIBNAME=libserialio.a LIB=${ARCH}/${LIBNAME} @@ -53,8 +55,8 @@ $(LIB): $(SRCS) ${OBJS} $(make-library) # Install the library, appending _g or _p as appropriate. -# for include files, just use $(INSTALL) +# for include files, just use $(INSTALL_CHANGE) preinstall: - $(INSTALL) -m 444 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/libchip + $(INSTALL_CHANGE) -m 444 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/libchip |