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/libbsp/hppa1.1/Makefile.in | 2 ++ c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in | 4 +++- c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in | 2 ++ c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in | 6 ++++-- c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in | 2 ++ c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.in | 2 ++ c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in | 2 ++ c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in | 6 ++++-- c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in | 2 ++ c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in | 2 ++ 10 files changed, 25 insertions(+), 5 deletions(-) (limited to 'c/src/lib/libbsp/hppa1.1') diff --git a/c/src/lib/libbsp/hppa1.1/Makefile.in b/c/src/lib/libbsp/hppa1.1/Makefile.in index f049e9b2e8..f786f6bff0 100644 --- a/c/src/lib/libbsp/hppa1.1/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/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/libbsp/hppa1.1/pxfl/Makefile.in b/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in index 8a1f64f2b2..ef7275eeaa 100644 --- a/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in @@ -14,6 +14,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/leaf.cfg @@ -47,4 +49,4 @@ all install:: eval $$cmd || $(EXIT_CMD); \ fi @$(ECHO); $(ECHO) - $(INSTALL) -m 444 $(srcdir)/floss-bsp.h $(PROJECT_INCLUDE)/bsp.h + $(INSTALL_CHANGE) -m 444 $(srcdir)/floss-bsp.h $(PROJECT_INCLUDE)/bsp.h diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in index 867e6d0ae7..7d2c8b92db 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/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/libbsp/hppa1.1/simhppa/include/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in index 51b045ba95..0d336f9700 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + H_PIECES = bsp coverhd H_FILES=$(H_PIECES:%=$(srcdir)/%.h) @@ -37,5 +39,5 @@ CLEAN_ADDITIONS += CLOBBER_ADDITIONS += all: $(SRCS) - $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE) - $(INSTALL) -m 444 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/rtems + $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE) + $(INSTALL_CHANGE) -m 444 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/rtems diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in index 8825079da7..af5d63c8f6 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/shmsupp.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.in index d982cdec4c..7e3a876cf2 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGMS=${ARCH}/start.o # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in index 240cf38e4b..7cd334ee3e 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@:@srcdir@/../../../shared RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/startup.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in index e90cae8569..9ae6a82538 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + # we use host compiler here for genoffsets. Hopefully it has same alignment!! USE_HOST_COMPILER=yes @@ -46,7 +48,7 @@ CLEAN_ADDITIONS += CLOBBER_ADDITIONS += all: ${ARCH} $(SRCS) $(PGMS) - $(INSTALL) -m 555 ${PGMS} ${PROJECT_RELEASE}/bin + $(INSTALL_CHANGE) -m 555 ${PGMS} ${PROJECT_RELEASE}/bin # Install the program(s), appending _g or _p as appropriate. -# for include files, just use $(INSTALL) +# for include files, just use $(INSTALL_CHANGE) diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in index 62f75c3b3d..2c00c52894 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/tty.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in index ef2b28198d..4b770e9f08 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + BSP_PIECES=startup tty # pieces to pick up out of libcpu/hppa CPU_PIECES=clock milli timer -- cgit v1.2.3