summaryrefslogtreecommitdiffstats
path: root/make/Templates
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-02-18 18:36:05 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-02-18 18:36:05 +0000
commit8548fe0ae29eafea856090e742c1fd205ed4b0fb (patch)
treeb0f3515dadfdea2a2e12a587ea5a2adaab2229db /make/Templates
parentPart of the automake VI patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>: (diff)
downloadrtems-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 '')
-rw-r--r--make/Templates/Makefile.leaf2
-rw-r--r--make/Templates/Makefile.lib2
2 files changed, 2 insertions, 2 deletions
diff --git a/make/Templates/Makefile.leaf b/make/Templates/Makefile.leaf
index d03155231d..b4c879529f 100644
--- a/make/Templates/Makefile.leaf
+++ b/make/Templates/Makefile.leaf
@@ -72,6 +72,6 @@ ${ARCH}/xxx-your-program-here: ${OBJS} ${LINK_FILES}
$(make-exe)
# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
install: all
$(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/bin
diff --git a/make/Templates/Makefile.lib b/make/Templates/Makefile.lib
index ebf9d66f68..9127ea70de 100644
--- a/make/Templates/Makefile.lib
+++ b/make/Templates/Makefile.lib
@@ -54,6 +54,6 @@ $(LIB): ${OBJS}
$(make-library)
# Install the library, appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
install: all
$(INSTALL_VARIANT) -m 644 ${LIB} ${PROJECT_RELEASE}/lib