From 1db8d62fb88a31a80aead20f2624a819264475db Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 5 Feb 2001 18:21:18 +0000 Subject: 2001-02-03 Ralf Corsepius * lib.cfg: include $(PROJECT_ROOT)/make/leaf.cfg * main.cfg: Set PROJECT_RELEASE=$(exec_prefix)/$(RTEMS_BSP). * host.cfg.in: Remove RM, make-script. * ChangeLog: Remove bogus 2001-01-22 entry. --- make/ChangeLog | 8 +++++--- make/host.cfg.in | 19 ------------------- make/lib.cfg | 2 +- make/main.cfg | 2 +- 4 files changed, 7 insertions(+), 24 deletions(-) (limited to 'make') diff --git a/make/ChangeLog b/make/ChangeLog index 34bcb294be..919e080324 100644 --- a/make/ChangeLog +++ b/make/ChangeLog @@ -1,7 +1,9 @@ -2001-01-22 Ralf Corsepius + 2001-02-03 Ralf Corsepius - * aclocal/bsp-alias.m4, aclocal/check-bsps.m4: Add simsh7032 and - simsh7045. + + * lib.cfg: include $(PROJECT_ROOT)/make/leaf.cfg + * main.cfg: Set PROJECT_RELEASE=$(exec_prefix)/$(RTEMS_BSP). + * host.cfg.in: Remove RM, make-script. * ChangeLog: Remove bogus 2001-01-22 entry. 2001-01-09 Joel Sherrill diff --git a/make/host.cfg.in b/make/host.cfg.in index aa215b8eae..6fbe0276c4 100644 --- a/make/host.cfg.in +++ b/make/host.cfg.in @@ -19,7 +19,6 @@ SHELL=@SHELL@ ECHO=echo CAT=cat -## RM=@RM@ -f CP=@CP@ MV=@MV@ LN=@LN@ @@ -49,24 +48,6 @@ GCCSED = @GCCSED@ # reliable but late model ksh's are usually OK. KSH=@KSH@ -# -# Rule to install a shell script with the proper shell to run it. -# - -# when debugging, one may want to save the previous incarnation of the -# installed script. Replace the first line of this rule to do this. -# -# -$(RM) $@.old -# -$(MV) $@ $@.old >/dev/null 2>&1 - -# OBSOLETE: Don't use this anymore, this may be removed in future -define make-script - -$(RM) $@ - $(SED) -e '1,1s?^#!KSHELL?#!$(KSH)?' \ - -e '1,1s?^#!SHELL?#!$(SHELL)?' < $< > $@ - $(CHMOD) 0555 $@ -endef - INSTBINFLAGS = -m 0755 INSTDATAFLAGS = -m 0644 INSTLIBFLAGS = -m 0644 diff --git a/make/lib.cfg b/make/lib.cfg index 88ba811e9a..47afd3e93e 100644 --- a/make/lib.cfg +++ b/make/lib.cfg @@ -7,7 +7,7 @@ # Assumes $(LIB) is set to $(ARCH)/libfoo.a # -include $(RTEMS_ROOT)/make/leaf.cfg +include $(PROJECT_ROOT)/make/leaf.cfg define make-library $(RM) $@ diff --git a/make/main.cfg b/make/main.cfg index a92256238c..900af71485 100644 --- a/make/main.cfg +++ b/make/main.cfg @@ -11,7 +11,7 @@ # but could be overridden in custom files. # -PROJECT_RELEASE=$(PROJECT_ROOT)/$(RTEMS_BSP) +PROJECT_RELEASE=$(exec_prefix)/$(RTEMS_BSP) PROJECT_BIN=$(PROJECT_ROOT)/bin PROJECT_INCLUDE=$(PROJECT_RELEASE)/lib/include PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools -- cgit v1.2.3