From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=48562 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PViee-0007CS-IE for qemu-devel@nongnu.org; Thu, 23 Dec 2010 05:44:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PViec-0003pt-N8 for qemu-devel@nongnu.org; Thu, 23 Dec 2010 05:44:16 -0500 Received: from mail-ww0-f53.google.com ([74.125.82.53]:57423) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PViec-0003dM-Iq for qemu-devel@nongnu.org; Thu, 23 Dec 2010 05:44:14 -0500 Received: by mail-ww0-f53.google.com with SMTP id 18so5886717wwi.10 for ; Thu, 23 Dec 2010 02:44:14 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 23 Dec 2010 11:43:59 +0100 Message-Id: <1293101042-13121-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1293101042-13121-1-git-send-email-pbonzini@redhat.com> References: <1293101042-13121-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v3 12/15] remove source_path_used List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Not necessary since we use mkdir -p and from this patch test -f. Also, dirname returns "." if a path has no directory component, as is the case for "sh configure". Signed-off-by: Paolo Bonzini --- configure | 45 ++++++++++++++++----------------------------- 1 files changed, 16 insertions(+), 29 deletions(-) diff --git a/configure b/configure index a9c0219..b3f771b 100755 --- a/configure +++ b/configure @@ -480,14 +480,7 @@ fi # find source path source_path=`dirname "$0"` -source_path_used="no" -workdir=`pwd` -if [ -z "$source_path" ]; then - source_path=$workdir -else - source_path=`cd "$source_path"; pwd` -fi -[ -f "$workdir/vl.c" ] || source_path_used="yes" +source_path=`cd "$source_path"; pwd` werror="" @@ -501,7 +494,6 @@ for opt do --interp-prefix=*) interp_prefix="$optarg" ;; --source-path=*) source_path="$optarg" - source_path_used="yes" ;; --cross-prefix=*) ;; @@ -3196,26 +3188,21 @@ echo "QEMU_INCLUDES+=$includes" >> $config_target_mak done # for target in $targets -# build tree in object directory if source path is different from current one -if test "$source_path_used" = "yes" ; then - DIRS="tests tests/cris slirp audio block net pc-bios/optionrom" - DIRS="$DIRS roms/seabios roms/vgabios" - DIRS="$DIRS fsdev ui" - FILES="Makefile tests/Makefile" - FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit" - FILES="$FILES tests/test-mmap.c" - FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" - FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile" - for bios_file in $source_path/pc-bios/*.bin $source_path/pc-bios/*.dtb $source_path/pc-bios/openbios-*; do - FILES="$FILES pc-bios/`basename $bios_file`" - done - for dir in $DIRS ; do - mkdir -p $dir - done - for f in $FILES ; do - symlink $source_path/$f $f - done -fi +# build tree in object directory in case the source is not in the current directory +DIRS="tests tests/cris slirp audio block net pc-bios/optionrom" +DIRS="$DIRS roms/seabios roms/vgabios" +DIRS="$DIRS fsdev ui" +FILES="Makefile tests/Makefile" +FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit" +FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" +FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile" +for bios_file in $source_path/pc-bios/*.bin $source_path/pc-bios/*.dtb $source_path/pc-bios/openbios-*; do + FILES="$FILES pc-bios/`basename $bios_file`" +done +mkdir -p $DIRS +for f in $FILES ; do + test -f $f || symlink $source_path/$f $f +done # temporary config to build submodules for rom in seabios vgabios ; do -- 1.7.3.2