2 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 1918a79..45eebc8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,2 @@
+ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = m4 src
diff --git a/autogen.sh b/autogen.sh
index dacf40e..7fd55ba 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 
-aclocal -I m4/ $ACLOCAL_FLAGS --install || exit 1
-libtoolize --copy --force || exit 1
-autoheader || exit 1
-autoconf || exit 1
-automake -a -c || exit 1
-
-[ "$NOCONFIGURE" ] || ./configure CFLAGS="$CFLAGS -Wall" --enable-maintainer-mode "$@"
+srcdir=`dirname "$0"`
+cd "$srcdir"
+autoreconf -i -f
+cd -
+[ "$NOCONFIGURE" ] || "$srcdir"/configure CFLAGS="$CFLAGS -Wall" --enable-maintainer-mode "$@"