1 files changed, 6 insertions, 4 deletions

diff --git a/tools/configure b/tools/configure
index 34d80328b9..cab737393b 100755
--- a/tools/configure
+++ b/tools/configure
@@ -315,7 +315,7 @@ if [ -z "$rootdir" ]; then
   cd $now
 fi
 
-
+apps="apps"
 appsdir='\$(ROOTDIR)/apps'
 
 if [ -z "$archos" ]; then
@@ -501,6 +501,7 @@ if [ -z "$debug" ]; then
       fi
       extradefines="-DBOOTLOADER" # for target makefile symbol EXTRA_DEFINES
       appsdir='\$(ROOTDIR)/bootloader'
+      apps="bootloader"
       bootloader="1"
       echo "Bootloader build selected"
       ;;
@@ -628,6 +629,7 @@ sed > Makefile \
  -e "s,@LOADADDRESS@,${loadaddress},g" \
  -e "s,@EXTRADEF@,${extradefines},g" \
  -e "s,@APPSDIR@,${appsdir},g" \
+ -e "s,@APPS@,${apps},g" \
  -e "s,@SIMVER@,${simver},g" \
  -e "s,@GCCVER@,${gccver},g" \
  -e "s,@GCCNUM@,${gccnum},g" \
@@ -682,12 +684,12 @@ MAKEFLAGS += --no-print-directory
 
 all:
         @\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware
-        @\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/apps
+        @\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@
 
 clean:
         @\$(MAKE) -C \$(FIRMDIR) clean OBJDIR=\$(BUILDDIR)/firmware
-        @\$(MAKE) -C \$(APPSDIR) clean OBJDIR=\$(BUILDDIR)/apps
-        @rm -rf rockbox.zip TAGS apps firmware comsim sim
+        @\$(MAKE) -C \$(APPSDIR) clean OBJDIR=\$(BUILDDIR)/@APPS@
+        @rm -rf rockbox.zip TAGS @APPS@ firmware comsim sim
 
 tags:
         @rm -f TAGS