From 2e027c714f89d1cee9a9091c90ef70f9ea464bbe Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 18 Apr 2003 04:26:11 +0000
Subject: Merger from rtems-4-6-branch.

---
 c/src/make/ChangeLog |  6 ++++++
 c/src/make/bsp.mak   | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/c/src/make/ChangeLog b/c/src/make/ChangeLog
index b9878e78ea..7c4d634766 100644
--- a/c/src/make/ChangeLog
+++ b/c/src/make/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-08	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* bsp.mak: Use var="$val" instead of var=${var=$val}. to satisfy
+	Solaris /bin/sh.
+	(Reported by Till Straumann <strauman@SLAC.Stanford.EDU>).
+
 2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove AC_CONFIG_AUX_DIR.
diff --git a/c/src/make/bsp.mak b/c/src/make/bsp.mak
index 2317859659..b343761853 100644
--- a/c/src/make/bsp.mak
+++ b/c/src/make/bsp.mak
@@ -8,9 +8,9 @@ include make/custom/${RTEMS_BSP}.cfg
 
 make/${RTEMS_BSP}.cache:
 	@$(RM) $@
-	@echo ac_cv_env_RTEMS_CPU_MODEL=\$${ac_cv_env_RTEMS_CPU_MODEL=$(RTEMS_CPU_MODEL)} >> $@
-	@echo ac_cv_env_RTEMS_BSP_FAMILY=\$${ac_cv_env_RTEMS_BSP_FAMILY=$(RTEMS_BSP_FAMILY)} >> $@
-	@echo ac_cv_env_CPU_CFLAGS=\$${ac_cv_env_CPU_CFLAGS=$(CPU_CFLAGS)} >> $@
-	@echo ac_cv_env_CFLAGS_OPTIMIZE_V=\$${ac_cv_env_CFLAGS_OPTIMIZE_V=$(CFLAGS_OPTIMIZE_V)} >> $@
-	@echo ac_cv_env_CFLAGS_DEBUG_V=\$${ac_cv_env_CFLAGS_DEBUG_V=$(CFLAGS_DEBUG_V)} >> $@
-	@echo ac_cv_env_CFLAGS_PROFILE_V=\$${ac_cv_env_CFLAGS_PROFILE_V=$(CFLAGS_PROFILE_V)} >> $@
+	@echo ac_cv_env_RTEMS_CPU_MODEL=\"$(RTEMS_CPU_MODEL)\" >> $@
+	@echo ac_cv_env_RTEMS_BSP_FAMILY=\"$(RTEMS_BSP_FAMILY)\" >> $@
+	@echo ac_cv_env_CPU_CFLAGS=\"$(CPU_CFLAGS)\" >> $@
+	@echo ac_cv_env_CFLAGS_OPTIMIZE_V=\"$(CFLAGS_OPTIMIZE_V)\" >> $@
+	@echo ac_cv_env_CFLAGS_DEBUG_V=\"$(CFLAGS_DEBUG_V)\" >> $@
+	@echo ac_cv_env_CFLAGS_PROFILE_V=\"$(CFLAGS_PROFILE_V)\" >> $@
-- 
cgit v1.2.3