From 0403d15d0ae671bc3fcfa1ef43342c8df2b86502 Mon Sep 17 00:00:00 2001
From: NicJA <NicJA@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Thu, 20 Apr 2017 04:42:06 +0000
Subject: [PATCH] expand CONFIGURE_OPTIONS

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@54571 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 scripts/nightly/pkg/bootiso | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/nightly/pkg/bootiso b/scripts/nightly/pkg/bootiso
index 63ed239683..9a404992d2 100644
--- a/scripts/nightly/pkg/bootiso
+++ b/scripts/nightly/pkg/bootiso
@@ -4,7 +4,7 @@
 BOOTLOADER=$1
 WITHCONTRIB=$2
 
-CONFIGURE_OPTIONS=
+CONFIGURE_OPTIONS=""
 
 TARGET=$BUILDTARGET
 if [[ "$VARIANT" != "" ]]; then
@@ -26,14 +26,18 @@ if [[ "$WITHCONTRIB" != "no" ]]; then
     copy    $SOURCE_CONTRIB $BUILD_BASE/AROS/contrib
 fi
 
-CONFIGURE_OPTIONS="--target=$TARGET --enable-target-variant=$VARIANT $CONFIGUREEXTRA --enable-ccache"
+CONFIGURE_OPTIONS="--target=$TARGET"
+if [[ "$VARIANT" != ""  ]]; then
+     CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --enable-target-variant=$VARIANT"
+fi
+CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $CONFIGUREEXTRA --enable-ccache"
 if [[ ( "$AROSTOOLCHAININSTALLOPT" != "" ) && -e  $TOOLCHAIN_BASE/$BUILDCPU-aros-gcc ]]; then
      CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $AROSTOOLCHAININSTALLOPT $AROSTOOLCHAINOPT"
 fi
 CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --with-bootloader=$BOOTLOADER --enable-build-type=nightly $PORTSSOURCESOPT"
 
 cd      $BUILD_BASE/AROS
-execute ./configure $CONFIGURE_OPTIONS
+execute ./configure ${CONFIGURE_OPTIONS}
 make    -j $MAKE_JOBS
 if [[ "$WITHCONTRIB" != "no" ]]; then
     make    -j $MAKE_JOBS contrib
-- 
2.11.4.GIT