diff options
-rwxr-xr-x | tools/configure | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/tools/configure b/tools/configure index b812867005..ee0b2a41ba 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -1235,9 +1235,8 @@ if [ -z "$rootdir" ]; then | |||
1235 | fi | 1235 | fi |
1236 | 1236 | ||
1237 | apps="apps" | 1237 | apps="apps" |
1238 | appsdir='\$(ROOTDIR)/apps' | 1238 | appsdir='$(ROOTDIR)/apps' |
1239 | firmdir='\$(ROOTDIR)/firmware' | 1239 | toolsdir='$(ROOTDIR)/tools' |
1240 | toolsdir='\$(ROOTDIR)/tools' | ||
1241 | 1240 | ||
1242 | 1241 | ||
1243 | ################################################################## | 1242 | ################################################################## |
@@ -3225,14 +3224,14 @@ fi | |||
3225 | 3224 | ||
3226 | case $btype in | 3225 | case $btype in |
3227 | [Ii]) | 3226 | [Ii]) |
3228 | appsdir='\$(ROOTDIR)/bootloader' | 3227 | appsdir='$(ROOTDIR)/bootloader' |
3229 | apps="bootloader" | 3228 | apps="bootloader" |
3230 | extradefines="$extradefines -DBOOTLOADER -DE200R_INSTALLER -ffunction-sections -fdata-sections" | 3229 | extradefines="$extradefines -DBOOTLOADER -DE200R_INSTALLER -ffunction-sections -fdata-sections" |
3231 | bootloader="1" | 3230 | bootloader="1" |
3232 | echo "e200R-installer build selected" | 3231 | echo "e200R-installer build selected" |
3233 | ;; | 3232 | ;; |
3234 | [Ee]) | 3233 | [Ee]) |
3235 | appsdir='\$(ROOTDIR)/bootloader' | 3234 | appsdir='$(ROOTDIR)/bootloader' |
3236 | apps="bootloader" | 3235 | apps="bootloader" |
3237 | echo "C2(4)0 or C2(5)0" | 3236 | echo "C2(4)0 or C2(5)0" |
3238 | variant=`input` | 3237 | variant=`input` |
@@ -3253,10 +3252,10 @@ fi | |||
3253 | if test $t_manufacturer = "archos"; then | 3252 | if test $t_manufacturer = "archos"; then |
3254 | # Archos SH-based players do this somewhat differently for | 3253 | # Archos SH-based players do this somewhat differently for |
3255 | # some reason | 3254 | # some reason |
3256 | appsdir='\$(ROOTDIR)/flash/bootbox' | 3255 | appsdir='$(ROOTDIR)/flash/bootbox' |
3257 | apps="bootbox" | 3256 | apps="bootbox" |
3258 | else | 3257 | else |
3259 | appsdir='\$(ROOTDIR)/bootloader' | 3258 | appsdir='$(ROOTDIR)/bootloader' |
3260 | apps="bootloader" | 3259 | apps="bootloader" |
3261 | flash="" | 3260 | flash="" |
3262 | if test -n "$boottool"; then | 3261 | if test -n "$boottool"; then |
@@ -3288,7 +3287,7 @@ fi | |||
3288 | ;; | 3287 | ;; |
3289 | [Gg]) | 3288 | [Gg]) |
3290 | extradefines="$extradefines -DSTUB" # for target makefile symbol EXTRA_DEFINES | 3289 | extradefines="$extradefines -DSTUB" # for target makefile symbol EXTRA_DEFINES |
3291 | appsdir='\$(ROOTDIR)/gdb' | 3290 | appsdir='$(ROOTDIR)/gdb' |
3292 | apps="stub" | 3291 | apps="stub" |
3293 | case $modelname in | 3292 | case $modelname in |
3294 | iriverifp7xx) | 3293 | iriverifp7xx) |
@@ -3306,7 +3305,7 @@ fi | |||
3306 | t_cpu=''; | 3305 | t_cpu=''; |
3307 | GCCOPTS=''; | 3306 | GCCOPTS=''; |
3308 | extradefines="$extradefines -DDEBUG" | 3307 | extradefines="$extradefines -DDEBUG" |
3309 | appsdir='\$(ROOTDIR)/tools/checkwps'; | 3308 | appsdir='$(ROOTDIR)/tools/checkwps'; |
3310 | output='checkwps.'${modelname}; | 3309 | output='checkwps.'${modelname}; |
3311 | archosrom=''; | 3310 | archosrom=''; |
3312 | echo "CheckWPS build selected" | 3311 | echo "CheckWPS build selected" |
@@ -3317,7 +3316,7 @@ fi | |||
3317 | toolset=''; | 3316 | toolset=''; |
3318 | t_cpu=''; | 3317 | t_cpu=''; |
3319 | GCCOPTS=''; | 3318 | GCCOPTS=''; |
3320 | appsdir='\$(ROOTDIR)/tools/database'; | 3319 | appsdir='$(ROOTDIR)/tools/database'; |
3321 | archosrom=''; | 3320 | archosrom=''; |
3322 | 3321 | ||
3323 | case $uname in | 3322 | case $uname in |
@@ -3639,7 +3638,7 @@ cat > Makefile <<EOF | |||
3639 | ## Automatically generated. http://www.rockbox.org/ | 3638 | ## Automatically generated. http://www.rockbox.org/ |
3640 | 3639 | ||
3641 | export ROOTDIR=${rootdir} | 3640 | export ROOTDIR=${rootdir} |
3642 | export FIRMDIR=${firmdir} | 3641 | export FIRMDIR=\$(ROOTDIR)/firmware |
3643 | export APPSDIR=${appsdir} | 3642 | export APPSDIR=${appsdir} |
3644 | export TOOLSDIR=${toolsdir} | 3643 | export TOOLSDIR=${toolsdir} |
3645 | export DOCSDIR=${rootdir}/docs | 3644 | export DOCSDIR=${rootdir}/docs |