From ec28eb29b72f3e376a7d53e482c75eb4df7fb72a Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 30 Apr 2010 08:52:54 -0600 Subject: [PATCH] autobuild.sh: use VPATH build Try to avoid future regressions on the VPATH front. * autobuild.sh: Uncomment VPATH use. * .gitignore: Exclude build directory. --- .gitignore | 1 + autobuild.sh | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 309becf2c7..41f7654c09 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ /autom4te.cache /build-aux /build-aux/ +/build/ /config.cache /config.guess /config.h diff --git a/autobuild.sh b/autobuild.sh index 91e2ab2b80..54fb273991 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 @@ -66,7 +66,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" \