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/i386/pc386/tools/Makefile.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'c/src/lib/libbsp/i386/pc386/tools') diff --git a/c/src/lib/libbsp/i386/pc386/tools/Makefile.in b/c/src/lib/libbsp/i386/pc386/tools/Makefile.in index 6aaa43c3d6..14383ab284 100644 --- a/c/src/lib/libbsp/i386/pc386/tools/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/tools/Makefile.in @@ -7,6 +7,8 @@ srcdir = @srcdir@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ + +INSTALL = @INSTALL@ exec_prefix = @exec_prefix@ bindir = @bindir@ libdir = @libdir@ @@ -64,7 +66,7 @@ CLEAN_ADDITIONS += $(HOST_ARCH) CLOBBER_ADDITIONS += all: $(ARCH) $(SRCS) $(PGMS) - $(INSTALL) -m 555 $(PGMS) ${PROJECT_RELEASE}/build-tools + $(INSTALL_CHANGE) -m 555 $(PGMS) ${PROJECT_RELEASE}/build-tools $(ARCH)/bin2boot: $(srcdir)/bin2boot.c $(CC) $(LDFLAGS) -o $@ $(srcdir)/bin2boot.c $(LD_LIBS) -- cgit v1.2.3