Try to avoid future regressions on the VPATH front. * autobuild.sh: Uncomment VPATH use. * .gitignore: Exclude build directory. --- The only change from when this patch was first introduced in v2 of the series is to call ../configure during the mingw build of ./autobuild.sh. .gitignore | 1 + autobuild.sh | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index fee8f8e..8da256e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ .git-module-status .sc-start-sc_* /GNUmakefile +/build /libvirt-[0-9]* /maint.mk /tools/virsh-console.gcda diff --git a/autobuild.sh b/autobuild.sh index 3379be4..4de5af8 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -11,11 +11,11 @@ test -n "$1" && RESULTS=$1 || RESULTS=results.log test -f Makefile && make -k distclean || : rm -rf coverage -#rm -rf build -#mkdir build -#cd build +rm -rf build +mkdir build +cd build -./autogen.sh --prefix="$AUTOBUILD_INSTALL_ROOT" \ +../autogen.sh --prefix="$AUTOBUILD_INSTALL_ROOT" \ --enable-test-coverage \ --enable-compile-warnings=error \ --with-xen-proxy @@ -62,7 +62,7 @@ if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig" \ CC="i686-pc-mingw32-gcc" \ - ./configure \ + ../configure \ --build=$(uname -m)-pc-linux \ --host=i686-pc-mingw32 \ --prefix="$AUTOBUILD_INSTALL_ROOT/i686-pc-mingw32/sys-root/mingw" \ -- 1.7.0.1 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list