diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2004-05-26 11:18:40 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2004-05-26 11:18:40 +0000 |
| commit | 052d21a667ea75fe90b937478eb128c50b9f3154 (patch) | |
| tree | 6ea044666466a0e2ae7fdc0fb1715cf1adea665c | |
| parent | 5c9c16f32f9872dc8490f5bd83054e49152ac33c (diff) | |
* removed some more unused stuff in the simulator makefile
* made the scan for the rockbox source dir a bit cooler, now it can detect
it even when you create and use a build directory that is on the same level
as the rockbox dir itself which might make it easier for people that builds
from (repeatly updated) daily tarballs
* now outputs the found rockbox source code dir found
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4706 a1c6a512-1295-4272-9138-f99709370657
| -rwxr-xr-x | tools/configure | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/tools/configure b/tools/configure index 2960e0c439..a6e92bea20 100755 --- a/tools/configure +++ b/tools/configure @@ -46,7 +46,6 @@ simul () { sed > Makefile \ -e "s,@ROOTDIR@,${rootdir},g" \ - -e "s,@TARGET@,${target},g" \ -e "s,@ARCHOS@,${archos},g" \ -e "s,@DEBUG@,${debug},g" \ -e "s,@DISPLAY@,${display},g" \ @@ -60,9 +59,7 @@ sed > Makefile \ ARCHOS=@ARCHOS@ ROOTDIR=@ROOTDIR@ SIMDIR=\$(ROOTDIR)/uisimulator/@SIMVER@ -TOOLSDIR=\$(ROOTDIR)/tools DEBUG=@DEBUG@ -TARGET=@TARGET@ DISPLAY=@DISPLAY@ KEYPAD=@KEYPAD@ THISDIR="@PWD@" @@ -125,11 +122,6 @@ whichlang() { done } - -# -# Beging Build Script -# - target=$1 debug=$2 @@ -175,7 +167,6 @@ if [ "$target" = "update" ]; then if { grep "^## Auto" Makefile >/dev/null 2>&1 ; } then echo "Existing generated Makefile found. Getting defaults from it." archos=`grep "^ARCHOS=" Makefile | cut -d= -f2-` - target=`grep "^TARGET=" Makefile | cut -d= -f2-` debug=`grep "^DEBUG=" Makefile | cut -d= -f2-` language=`grep "^LANGUAGE=" Makefile | cut -d= -f2-` memory=`grep "^MEMORYSIZE=" Makefile | cut -d= -f2-` @@ -186,6 +177,8 @@ if [ "$target" = "update" ]; then display=`grep "^DISPLAY=" Makefile | cut -d= -f2-` keypad=`grep "^KEYPAD=" Makefile | cut -d= -f2-` simver=`grep "^SIMVER=" Makefile | cut -d= -f2-` + else + target=`grep "^TARGET=" Makefile | cut -d= -f2-` fi fi fi @@ -317,7 +310,7 @@ if [ -z "$rootdir" ]; then firmfile="crt0.S" # a file to check for in the firmware root dir - for dir in . .. ../..; do + for dir in . .. ../.. ../rockbox*; do if [ -f $dir/firmware/$firmfile ]; then rootdir=$dir break @@ -338,6 +331,10 @@ if [ -z "$rootdir" ]; then cd $rootdir rootdir=`pwd` + echo "Using this source code root directory:" + echo $rootdir + echo "" + # cd back to the build dir cd $now fi |