diff options
author | Daniel Stenberg <daniel@haxx.se> | 2005-12-05 08:32:02 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2005-12-05 08:32:02 +0000 |
commit | 48b11e862e5a49acd48b0ba4cf41e16b03396581 (patch) | |
tree | 3dbb5fc10cd0569b45c525d4cce39a96611748f6 /tools | |
parent | f667b87ec9e35b36aa0738d18335365f6509c880 (diff) | |
download | rockbox-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
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/configure | 15 |
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 \ | |||
832 | EOF | 832 | EOF |
833 | 833 | ||
834 | if test "$simulator" = "yes"; then | 834 | if test "$simulator" = "yes"; then |
835 | # verify that we have a sed version we can use! | ||
836 | lines=`echo "moo" | sed -e '/moo/cline1\nline2\nline3' | wc -l` | ||
837 | if test "$lines" -eq "1"; then | ||
838 | echo "You have a broken sed version. You must upgrade to be able to " | ||
839 | echo "generate a fine Makefile. See details at:" | ||
840 | echo "http://www.rockbox.org/twiki/bin/view/Main/BrokenSed" | ||
841 | exit | ||
842 | else | ||
843 | version=`sed --version | head -n 1` | ||
844 | echo "$version is a fine sed" | ||
845 | fi | ||
846 | |||
847 | # add simul make stuff on the #SIMUL# line | 835 | # add simul make stuff on the #SIMUL# line |
848 | simmagic='/#SIMUL#/c\ @$(MAKE) -C $(SIMDIR) OBJDIR=$(BUILDDIR)/sim\n @$(MAKE) -C $(ROOTDIR)/uisimulator/common OBJDIR=$(BUILDDIR)/comsim' | 836 | simmagic="s,#SIMUL#,\ @\$(MAKE) -C \$(SIMDIR) OBJDIR=\$(BUILDDIR)/sim\n @\$(MAKE) -C \$(ROOTDIR)/uisimulator/common OBJDIR=\$(BUILDDIR)/comsim," |
849 | else | 837 | else |
850 | # delete the line that matches | 838 | # delete the line that matches |
851 | simmagic='/#SIMUL#/D' | 839 | simmagic='/#SIMUL#/D' |
@@ -888,7 +876,6 @@ sed > Makefile \ | |||
888 | -e "s,@ENDIAN@,${defendian},g" \ | 876 | -e "s,@ENDIAN@,${defendian},g" \ |
889 | -e "s,@TOOLSET@,${toolset},g" \ | 877 | -e "s,@TOOLSET@,${toolset},g" \ |
890 | -e "${simmagic}" \ | 878 | -e "${simmagic}" \ |
891 | -e "${simtools}" \ | ||
892 | <<EOF | 879 | <<EOF |
893 | ## Automaticly generated. http://www.rockbox.org/ | 880 | ## Automaticly generated. http://www.rockbox.org/ |
894 | 881 | ||