[next] telepathy-glib: build: cd to the $srcdir in autogen.sh for running gtkdocize

George Kiagiadakis gkiagia at kemper.freedesktop.org
Fri Dec 2 16:20:40 UTC 2016


Module: telepathy-glib
Branch: next
Commit: dc39be2757bd7fa789c3db834d8d701b1f54f785
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=dc39be2757bd7fa789c3db834d8d701b1f54f785

Author: Philip Withnall <philip at tecnocode.co.uk>
Date:   Fri Mar  4 01:20:40 2016 +0000

build: cd to the $srcdir in autogen.sh for running gtkdocize

gtkdocize needs to run in the $srcdir (or have a --srcdir argument
passed to it) so that it can find configure.[ac|in]. Ensure that’s the
case in autogen.sh.

This fixes autogen.sh in a srcdir ≠ builddir environment.

---

 autogen.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index 3184e69..21860dd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,13 @@
 #!/bin/sh
 set -e
 
+test -n "$srcdir" || srcdir=$(dirname "$0")
+test -n "$srcdir" || srcdir=.
+
+olddir=$(pwd)
+
+cd $srcdir
+
 gtkdocize
 
 if test -n "$AUTOMAKE"; then
@@ -34,6 +41,8 @@ else
     run_configure=false
 fi
 
+cd "$olddir"
+
 if test $run_configure = true; then
-    ./configure "$@"
+    $srcdir/configure "$@"
 fi



More information about the telepathy-commits mailing list