1 files changed, 7 insertions, 11 deletions
diff --git a/autogen.sh b/autogen.sh
index 21860dd94..a47248cc4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,15 +1,9 @@
 #!/bin/sh
 set -e
 
-test -n "$srcdir" || srcdir=$(dirname "$0")
+test -n "$srcdir" || srcdir=`dirname "$0"`
 test -n "$srcdir" || srcdir=.
 
-olddir=$(pwd)
-
-cd $srcdir
-
-gtkdocize
-
 if test -n "$AUTOMAKE"; then
     : # don't override an explicit user request
 elif automake-1.11 --version >/dev/null 2>/dev/null && \
@@ -23,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
@@ -41,8 +39,6 @@ else
     run_configure=false
 fi
 
-cd "$olddir"
-
 if test $run_configure = true; then
-    $srcdir/configure "$@"
+    "$srcdir/configure" "$@"
 fi