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/tests/support | |
| 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/tests/support')
| -rw-r--r-- | c/src/tests/support/Makefile.in | 2 | ||||
| -rw-r--r-- | c/src/tests/support/include/Makefile.in | 6 | ||||
| -rw-r--r-- | c/src/tests/support/stubdr/Makefile.in | 4 | ||||
| -rw-r--r-- | c/src/tests/support/wrapup/Makefile.in | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/c/src/tests/support/Makefile.in b/c/src/tests/support/Makefile.in index d67efb6814..49dded11f1 100644 --- a/c/src/tests/support/Makefile.in +++ b/c/src/tests/support/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/tests/support/include/Makefile.in b/c/src/tests/support/include/Makefile.in index 30e7468784..dbca2bad6e 100644 --- a/c/src/tests/support/include/Makefile.in +++ b/c/src/tests/support/include/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + H_FILES= $(srcdir)/tmacros.h SYS_H_FILES= @@ -21,6 +23,6 @@ CLEAN_ADDITIONS += CLOBBER_ADDITIONS += all: $(SRCS) - $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE) - $(INSTALL) -m 444 $(SYS_H_FILES) $(PROJECT_INCLUDE)/sys + $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE) + $(INSTALL_CHANGE) -m 444 $(SYS_H_FILES) $(PROJECT_INCLUDE)/sys diff --git a/c/src/tests/support/stubdr/Makefile.in b/c/src/tests/support/stubdr/Makefile.in index 3676d2b650..a7f67c89a3 100644 --- a/c/src/tests/support/stubdr/Makefile.in +++ b/c/src/tests/support/stubdr/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/stubdr.rel # C source names, if any, go here -- minus the .c @@ -54,5 +56,5 @@ ${PGM}: ${SRCS} ${OBJS} $(make-rel) all: ${ARCH} $(SRCS) $(PGM) - $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE) + $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE) $(INSTALL_VARIANT) -m 644 $(PGM) ${PROJECT_RELEASE}/lib diff --git a/c/src/tests/support/wrapup/Makefile.in b/c/src/tests/support/wrapup/Makefile.in index 31f78c914b..cc8afc8154 100644 --- a/c/src/tests/support/wrapup/Makefile.in +++ b/c/src/tests/support/wrapup/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + GENERIC_PIECES=stubdr # bummer; have to use $foreach since % pattern subst rules only replace 1x |