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/powerpc/ppcn_60x/Makefile.in | 2 ++ c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.in | 2 ++ c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.in | 2 ++ c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.in | 4 +++- c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.in | 2 ++ c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.in | 2 ++ c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.in | 2 ++ c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.in | 2 ++ c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.in | 4 +++- c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.in | 2 ++ c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.in | 2 ++ c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.in | 2 ++ c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.in | 2 ++ c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.in | 2 ++ 14 files changed, 30 insertions(+), 2 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/ppcn_60x') diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.in index ff468879d0..da1b5ec180 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.in +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/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/powerpc/ppcn_60x/clock/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.in index 7c2cfc0772..b4eb3356d8 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.in +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/clock.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.in index 4c05c37698..a07c8e1881 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.in +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/console.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.in index 011a5629e2..472e0c0e33 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.in +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h $(srcdir)/chain.h \ $(srcdir)/tod.h $(srcdir)/nvram.h $(srcdir)/pci.h @@ -33,4 +35,4 @@ CLEAN_ADDITIONS += CLOBBER_ADDITIONS += all: $(SRCS) - $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE) + $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE) diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.in index cef35eb353..ac8c6bf02c 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.in +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/network.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.in index 5cf4e06e0e..c7ce77efce 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.in +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/nvram.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.in index 941fc1ada7..d12f670f5b 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.in +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/pci.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.in index 3e7884433a..6b65acc00a 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.in +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/start.o # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.in index 25464864d2..a76714eb31 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.in +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/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 @@ -59,4 +61,4 @@ ${PGM}: ${SRCS} ${OBJS} $(make-rel) all: ${ARCH} $(SRCS) $(PGM) - $(INSTALL) $(srcdir)/linkcmds ${PROJECT_RELEASE}/lib + $(INSTALL_CHANGE) $(srcdir)/linkcmds ${PROJECT_RELEASE}/lib diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.in index 16665e4de9..4c6affa027 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.in +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/timer.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.in index 240373136e..ebbc526ed6 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.in +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/tod.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.in index 9498744792..13741e0187 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.in +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/universe.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.in index d17e897c7d..b65178e44f 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.in +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/vectors.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.in index d6b2ed0bad..52ca7c135e 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.in +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + # We only build the network device driver if HAS_NETWORK was defined NETWORK_DRIVER_yes_V = network NETWORK_DRIVER = $(NETWORK_DRIVER_$(HAS_NETWORK)_V) -- cgit v1.2.3