summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2005-12-05 08:32:02 +0000
committerDaniel Stenberg <daniel@haxx.se>2005-12-05 08:32:02 +0000
commit48b11e862e5a49acd48b0ba4cf41e16b03396581 (patch)
tree3dbb5fc10cd0569b45c525d4cce39a96611748f6
parentf667b87ec9e35b36aa0738d18335365f6509c880 (diff)
downloadrockbox-48b11e862e5a49acd48b0ba4cf41e16b03396581.tar.gz
rockbox-48b11e862e5a49acd48b0ba4cf41e16b03396581.zip
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
-rwxr-xr-xtools/configure15
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/