2 files changed, 9 insertions, 10 deletions

diff --git a/scripts/poky-autobuild b/scripts/poky-autobuild
index 1dd31e2a84..752e0a7bb0 100755
--- a/scripts/poky-autobuild
+++ b/scripts/poky-autobuild
@@ -31,13 +31,11 @@ if [ "xpreamble" = "x$1" ]; then
     exit 0
 fi
 
-BBTARGET="$1"
-shift
-
+BDIR="build"
 . ./scripts/poky-env-internal
 POSTPROCESS=`which poky-autobuild-postprocess`
 
-if [ "xcomplete" = "x$BBTARGET" ]; then
+if [ "xcomplete" = "x$1" ]; then
     touch ./tmp/deploy/images/images-complete
     chmod a+w ./tmp/deploy/images/images-complete
     cd ..
@@ -59,7 +57,7 @@ if [ ! -e "$CONFFILE" ]; then
     echo 'DL_DIR = "/srv/poky/sources"' >> "$CONFFILE"
 fi
 
-bitbake $BBTARGET
+bitbake $@
 
 cd ..
 
diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal
index 489956ebce..78646e3c6e 100755
--- a/scripts/poky-env-internal
+++ b/scripts/poky-env-internal
@@ -23,11 +23,12 @@
 # Also update the locations at the top of conf/local.conf
 
 OEROOT=`pwd`
-
-if [ "x$1" = "x" ]; then
-        BDIR="build"
-else
-        BDIR="$1"
+if [ "x$BDIR" = "x" ]; then
+        if [ "x$1" = "x" ]; then
+                BDIR="build"
+        else
+                BDIR="$1"
+        fi
 fi
 
 BBDIR="$OEROOT/bitbake/"