From 6fc3a703a2f813c1d04196b915e2112bef5b09aa Mon Sep 17 00:00:00 2001 From: Alban Browaeys Date: Tue, 22 Jan 2013 11:06:41 +0100 Subject: [PATCH] build: fix out of source builddir - autogen.sh source tools (autoreconf, gtkdocize) are run from source directory while build tools (configure) are run from builddir (while still located in the sourcedir). --- autogen.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/autogen.sh b/autogen.sh index 3184e69..9dceb55 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,7 +1,8 @@ #!/bin/sh set -e -gtkdocize +srcdir="`dirname -- \"$0\"`" +srcdir="`( cd \"$srcdir\"; pwd )`" if test -n "$AUTOMAKE"; then : # don't override an explicit user request @@ -16,7 +17,11 @@ elif automake-1.11 --version >/dev/null 2>/dev/null && \ export ACLOCAL fi -autoreconf -i -f +( + cd "$srcdir" + gtkdocize + autoreconf -i -f +) # Honor NOCONFIGURE for compatibility with gnome-autogen.sh if test x"$NOCONFIGURE" = x; then @@ -35,5 +40,5 @@ else fi if test $run_configure = true; then - ./configure "$@" + "$srcdir/configure" "$@" fi -- 1.8.2.rc3