From 196094eb79c6f6f139f7cab82d50f0dd3240f7dd Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 19 Apr 1999 13:19:14 +0000 Subject: Patch from Ralf Corsepius : This one is an enhancement to acpolish. It replaces some Makefile variables by others variable in Makefile.ins (tries to use unique name for some variables). It therefore eases parsing Makefile.ins for further automatic Makefile.in conversions in future. To apply: cd sh /rtems-rc-19990407-8.sh ./autogen --- tools/cpu/Makefile.in | 2 +- tools/update/acpolish | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/cpu/Makefile.in b/tools/cpu/Makefile.in index c8d387af9f..731772bf72 100644 --- a/tools/cpu/Makefile.in +++ b/tools/cpu/Makefile.in @@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg +include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg include $(RTEMS_ROOT)/make/directory.cfg SUB_DIRS=generic $(wildcard $(RTEMS_CPU)) diff --git a/tools/update/acpolish b/tools/update/acpolish index 485ba2131c..d348bf9ae6 100755 --- a/tools/update/acpolish +++ b/tools/update/acpolish @@ -67,6 +67,21 @@ while( <> ) $nl_seen = $nl_seen+1; } + if ( /^(.*)\$\(RTEMS_BSP\)(.*)$/o ) + { + $_ = "$1\$\{RTEMS_BSP\}$2\n" ; + } + + if ( /^(.*)\$\(PROJECT_ROOT\)\/\$\{RTEMS_BSP\}\/lib\/include(.*)$/o ) + { + $_ = "$1\$\(PROJECT_INCLUDE\)$2\n" ; + } + + if ( /^(.*)\$\{PROJECT_RELEASE\}(.*)$/o ) + { + $_ = "$1\$\{PROJECT_RELEASE\}$2\n" ; + } + if ( /^[ ]*srcdir[ ]*=.*$/o ) { print "\@SET_MAKE\@\n" ; -- cgit v1.2.3