Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
configure | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/configure b/configure
index 432bd3b..8ed9736 100755
--- a/configure
+++ b/configure
@@ -182,8 +182,8 @@ for opt do
;;
CC=*|--cc=*) CC="$optarg"
;;
- --srcdir=*|--source-path=*) source_path="$optarg"
- source_path_used="yes"
+ --srcdir=*|--source-path=*) srcdir="$optarg"
+ srcdir_used="yes"
;;
CPP=*) CPP="$optarg"
;;
@@ -245,15 +245,15 @@ else
fi
# find source path
-source_path=`dirname "$0"`
-source_path_used="no"
+srcdir=`dirname "$0"`
+srcdir_used="no"
workdir=`pwd`
-if [ -z "$source_path" ]; then
- source_path=$workdir
+if [ -z "$srcdir" ]; then
+ srcdir=$workdir
else
- source_path=`cd "$source_path"; pwd`
+ srcdir=`cd "$srcdir"; pwd`
fi
-[ -f "$workdir/vl.c" ] || source_path_used="yes"
+[ -f "$workdir/vl.c" ] || srcdir_used="yes"
check_define() {
cat > $TMPC <<EOF
@@ -834,7 +834,7 @@ echo " --with-oss-lib path to OSS library"
echo " --with-headers=PATH look for kernel includes in PATH"
echo ""
echo "Advanced options (experts only):"
-echo " --srcdir=PATH path of source code [$source_path]"
+echo " --srcdir=PATH path of source code [$srcdir]"
echo " --enable-targets=LIST choose compiled targets [$target_list]"
echo " --with-sysroot=PREFIX where to find shared libraries, etc."
echo " use %M for cpu name [$sysroot]"
@@ -927,7 +927,7 @@ echo ""
echo "Deprecated options:"
echo " --interp-prefix=PREFIX where to find shared libraries, etc."
echo " use %M for cpu name [$sysroot]"
-echo " --source-path=PATH path of source code [$source_path]"
+echo " --source-path=PATH path of source code [$srcdir]"
echo " --cc=CC use C compiler CC [$cc]"
echo " --extra-cflags=CFLAGS append extra C compiler flags QEMU_CFLAGS"
echo " --extra-ldflags=LDFLAGS append extra linker flags LDFLAGS"
@@ -2205,7 +2205,7 @@ fi
##########################################
# check if trace backend exists
-sh "$source_path/tracetool" "--$trace_backend" --check-backend > /dev/null 2>
/dev/null
+sh "$srcdir/tracetool" "--$trace_backend" --check-backend > /dev/null 2>
/dev/null
if test "$?" -ne 0 ; then
echo
echo "Error: invalid trace backend"
@@ -2237,7 +2237,7 @@ fi
# Consult white-list to determine whether to enable werror
# by default. Only enable by default for git builds
-z_version=`cut -f3 -d. $source_path/VERSION`
+z_version=`cut -f3 -d. $srcdir/VERSION`
if test -z "$werror" ; then
if test "$z_version" = "50" -a \
@@ -2308,7 +2308,7 @@ if test "$mingw32" = "no" ; then
echo "Manual directory `eval echo $mandir`"
echo "Target sysroot `eval echo $sysroot`"
fi
-echo "Source path $source_path"
+echo "Source path $srcdir"
echo "C compiler $cc"
echo "C preprocessor $cpp"
echo "CFLAGS $CFLAGS"
@@ -2517,10 +2517,10 @@ fi
if test "$uuid" = "yes" ; then
echo "CONFIG_UUID=y" >> $config_host_mak
fi
-qemu_version=`head $source_path/VERSION`
+qemu_version=`head $srcdir/VERSION`
echo "VERSION=$qemu_version" >>$config_host_mak
echo "PKGVERSION=$pkgversion" >>$config_host_mak
-echo "srcdir=$source_path" >> $config_host_mak
+echo "srcdir=$srcdir" >> $config_host_mak
echo "TARGET_DIRS=$target_list" >> $config_host_mak
if [ "$docs" = "yes" ] ; then
echo "BUILD_DOCS=yes" >> $config_host_mak
@@ -2710,7 +2710,7 @@ fi
for d in libdis libdis-user; do
mkdir -p $d
rm -f $d/Makefile
- ln -s $source_path/Makefile.dis $d/Makefile
+ ln -s $srcdir/Makefile.dis $d/Makefile
echo > $d/config.mak
done
if test "$static" = "no" -a "$user_pie" = "yes" ; then
@@ -2779,7 +2779,7 @@ fi
# don't use ln -sf as not all "ln -sf" over write the file/link
#
rm -f $target_dir/Makefile
-ln -s $source_path/Makefile.target $target_dir/Makefile
+ln -s $srcdir/Makefile.target $target_dir/Makefile
echo "# Automatically generated by configure - do not modify" >
$config_target_mak
@@ -2959,7 +2959,7 @@ fi
list=""
if test ! -z "$gdb_xml_files" ; then
for x in $gdb_xml_files; do
- list="$list $source_path/gdb-xml/$x"
+ list="$list $srcdir/gdb-xml/$x"
done
echo "TARGET_XML_FILES=$list" >> $config_target_mak
fi
@@ -3133,7 +3133,7 @@ echo "QEMU_CPPFLAGS+=$cppflags" >> $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
+if test "$srcdir_used" = "yes" ; then
DIRS="tests tests/cris slirp audio block net pc-bios/optionrom"
DIRS="$DIRS roms/seabios roms/vgabios"
DIRS="$DIRS fsdev ui"
@@ -3142,7 +3142,7 @@ if test "$source_path_used" = "yes" ; then
FILES="$FILES tests/test-mmap.c"
FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps pc-bios/video.x"
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
+ for bios_file in $srcdir/pc-bios/*.bin $srcdir/pc-bios/*.dtb
$srcdir/pc-bios/openbios-*; do
FILES="$FILES pc-bios/`basename $bios_file`"
done
for dir in $DIRS ; do
@@ -3151,7 +3151,7 @@ if test "$source_path_used" = "yes" ; then
# remove the link and recreate it, as not all "ln -sf" overwrite the link
for f in $FILES ; do
rm -f $f
- ln -s $source_path/$f $f
+ ln -s $srcdir/$f $f
done
fi
@@ -3159,7 +3159,7 @@ fi
for rom in seabios vgabios ; do
config_mak=roms/$rom/config.mak
echo "# Automatically generated by configure - do not modify" > $config_mak
- echo "srcdir=$source_path/roms/$rom" >> $config_mak
+ echo "srcdir=$srcdir/roms/$rom" >> $config_mak
echo "CC=$cc" >> $config_mak
echo "BCC=bcc" >> $config_mak
echo "CPP=$cpp" >> $config_mak
@@ -3173,14 +3173,14 @@ for hwlib in 32 64; do
mkdir -p $d
mkdir -p $d/ide
rm -f $d/Makefile
- ln -s $source_path/Makefile.hw $d/Makefile
+ ln -s $srcdir/Makefile.hw $d/Makefile
echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak
done
d=libuser
mkdir -p $d
rm -f $d/Makefile
-ln -s $source_path/Makefile.user $d/Makefile
+ln -s $srcdir/Makefile.user $d/Makefile
if test "$static" = "no" -a "$user_pie" = "yes" ; then
echo "QEMU_CFLAGS+=-fpie" > $d/config.mak
fi
--
1.7.2.3
