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). --- tools/cpu/unix/Makefile.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tools/cpu/unix/Makefile.in') diff --git a/tools/cpu/unix/Makefile.in b/tools/cpu/unix/Makefile.in index 0b8402d15f..75320594ea 100644 --- a/tools/cpu/unix/Makefile.in +++ b/tools/cpu/unix/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + # we use host compiler here for gensize. Hopefully it has same alignment!! USE_HOST_COMPILER=yes @@ -52,7 +54,7 @@ CLOBBER_ADDITIONS += all: preinstall preinstall: ${ARCH} $(SRCS) $(PGMS) - @INSTALL@ $(INSTBINFLAGS) $(PGMS) ${PROJECT_RELEASE}/bin + $(INSTALL) $(INSTBINFLAGS) $(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) -- cgit v1.2.3