Stop using sed's /c option when building the simulator Makefile. This should

lessen the requirments on what sed (version) that is used.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8152 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 1 insertions, 14 deletions

diff --git a/tools/configure b/tools/configure
index dd905dae2f..ca9eaa23aa 100755
--- a/tools/configure
+++ b/tools/configure
@@ -832,20 +832,8 @@ sed > autoconf.h \
 EOF
 
 if test "$simulator" = "yes"; then
-  # verify that we have a sed version we can use!
-  lines=`echo "moo" | sed -e '/moo/cline1\nline2\nline3' | wc -l`
-  if test "$lines" -eq "1"; then
-    echo "You have a broken sed version. You must upgrade to be able to "
-    echo "generate a fine Makefile. See details at:"
-    echo "http://www.rockbox.org/twiki/bin/view/Main/BrokenSed"
-    exit
-  else
-    version=`sed --version | head -n 1`
-    echo "$version is a fine sed"
-  fi
-
   # add simul make stuff on the #SIMUL# line
-  simmagic='/#SIMUL#/c\ @$(MAKE) -C $(SIMDIR) OBJDIR=$(BUILDDIR)/sim\n  @$(MAKE) -C $(ROOTDIR)/uisimulator/common OBJDIR=$(BUILDDIR)/comsim'
+  simmagic="s,#SIMUL#,\ @\$(MAKE) -C \$(SIMDIR) OBJDIR=\$(BUILDDIR)/sim\n       @\$(MAKE) -C \$(ROOTDIR)/uisimulator/common OBJDIR=\$(BUILDDIR)/comsim,"
 else
   # delete the line that matches
   simmagic='/#SIMUL#/D'
@@ -888,7 +876,6 @@ sed > Makefile \
  -e "s,@ENDIAN@,${defendian},g" \
  -e "s,@TOOLSET@,${toolset},g" \
  -e "${simmagic}" \
- -e "${simtools}" \
 <<EOF
 ## Automaticly generated. http://www.rockbox.org/