ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove source_path_used 

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 <pbonzini@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Paolo Bonzini 2010-12-23 11:43:59 +01:00 committed by Blue Swirl
parent 11568d6df9
commit d1807a4f83
1 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
configure vendored
View File

@ -480,14 +480,7 @@ fi
# find source path # find source path
source_path=`dirname "$0"` source_path=`dirname "$0"`
source_path_used="no" source_path=`cd "$source_path"; pwd`
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"
werror="" werror=""
@ -501,7 +494,6 @@ for opt do
--interp-prefix=*) interp_prefix="$optarg" --interp-prefix=*) interp_prefix="$optarg"
;; ;;
--source-path=*) source_path="$optarg" --source-path=*) source_path="$optarg"
source_path_used="yes"
;; ;;
--cross-prefix=*) --cross-prefix=*)
;; ;;
@ -3234,26 +3226,21 @@ echo "QEMU_INCLUDES+=$includes" >> $config_target_mak
done # for target in $targets done # for target in $targets
# build tree in object directory if source path is different from current one # build tree in object directory in case the source is not in the current directory
if test "$source_path_used" = "yes" ; then DIRS="tests tests/cris slirp audio block net pc-bios/optionrom"
DIRS="tests tests/cris slirp audio block net pc-bios/optionrom" DIRS="$DIRS roms/seabios roms/vgabios"
DIRS="$DIRS roms/seabios roms/vgabios" DIRS="$DIRS fsdev ui"
DIRS="$DIRS fsdev ui" FILES="Makefile tests/Makefile"
FILES="Makefile tests/Makefile" FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit" FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
FILES="$FILES tests/test-mmap.c" FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" for bios_file in $source_path/pc-bios/*.bin $source_path/pc-bios/*.dtb $source_path/pc-bios/openbios-*; do
FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile" FILES="$FILES pc-bios/`basename $bios_file`"
for bios_file in $source_path/pc-bios/*.bin $source_path/pc-bios/*.dtb $source_path/pc-bios/openbios-*; do done
FILES="$FILES pc-bios/`basename $bios_file`" mkdir -p $DIRS
done for f in $FILES ; do
for dir in $DIRS ; do test -f $f || symlink $source_path/$f $f
mkdir -p $dir done
done
for f in $FILES ; do
symlink $source_path/$f $f
done
fi
# temporary config to build submodules # temporary config to build submodules
for rom in seabios vgabios ; do for rom in seabios vgabios ; do