- Make ACLOCAL_FLAGS work when srcdir != builddir [#409292] - Don't copy

* autogen.sh:
- Make ACLOCAL_FLAGS work when srcdir != builddir [#409292]
- Don't copy gnome-doc-utils.m4, since we don't need to

svn path=/trunk/; revision=885

2 files changed, 9 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 77442c7..64cc933 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-02-19  Shaun McCance  <shaunm@gnome.org>
 
+	* autogen.sh:
+	- Make ACLOCAL_FLAGS work when srcdir != builddir [#409292]
+	- Don't copy gnome-doc-utils.m4, since we don't need to
+
+2007-02-19  Shaun McCance  <shaunm@gnome.org>
+
 	* tools/gnome-doc-utils.make:
 	- Use abs_srcdir to remove some relative path stupidity [#409341]
 
diff --git a/autogen.sh b/autogen.sh
index 023651b..2c7518a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,6 +3,7 @@
 
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
+abs_srcdir=`(cd $srcdir && pwd)`
 
 PKG_NAME="gnome-doc-utils"
 
@@ -19,10 +20,7 @@ which gnome-autogen.sh || {
     exit 1
 }
 
-# Bootstrap off the local gnome-doc-utils.m4
-ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS"
-export ACLOCAL_FLAGS
-
-cp $srcdir/tools/gnome-doc-utils.m4 gnome-doc-utils.m4
+# tools/ has gnome-doc-utils.m4 which is necessary to bootstrap g-d-u
+ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $abs_srcdir/tools"
 
 REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh