summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Withnall <philip.withnall@collabora.co.uk>2016-03-21 15:38:07 +0000
committerZeeshan Ali (Khattak) <zeeshanak@gnome.org>2016-03-22 12:32:51 +0000
commitb754c05f344b9fb6cc15caf83e03465eb2ddf0b2 (patch)
treee41143312d5e8af844d668d4a26b56fdcabb27d2
parent4314baa8345620635ab24032dee271e3cecdc3b5 (diff)
downloadgeoclue-b754c05f344b9fb6cc15caf83e03465eb2ddf0b2.tar.gz
build: Fix autogen.sh against builddir ≠ srcdir
When run from outside the srcdir, autogen.sh was failing because various of the tools it calls expect to be called from within srcdir. https://bugs.freedesktop.org/show_bug.cgi?id=94649
-rwxr-xr-xautogen.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/autogen.sh b/autogen.sh
index 337d372..a9f65b3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,10 @@ REQUIRED_AUTOMAKE_VERSION=1.9
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
-mkdir -p m4
+olddir=$(pwd)
+
+cd $srcdir
+
PKG_NAME=GeoClue
git submodule update --init --recursive
@@ -14,6 +17,7 @@ gtkdocize
autoreconf -v --force --install
intltoolize -f
+cd "$olddir"
if [ -z "$NOCONFIGURE" ]; then
"$srcdir"/configure --enable-maintainer-mode --enable-debug ${1+"$@"}
fi