Test updates...

[nagiosplug.git] / tools / setup

diff --git a/tools/setup b/tools/setup
index 94bd077fa410149fd6d24415c90d9322f3185573..6da3f674837f6b7fd787a09560e64a4b725d5845 100755 (executable)
--- a/tools/setup
+++ b/tools/setup
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # autogen.sh glue from CMU Cyrus IMAP
-# $Id$
 #
 # Requires: automake, autoconf, dpkg-dev
 # set -e
@@ -18,17 +17,17 @@ else
        echo Found GNU Make at $MAKE ... good.
 fi
 
-( cd m4 && $MAKE -f Makefile.am.in Makefile.am )
-
 # This bit is to fix SF's compile server as libtool not installed by default
 extra=""
 if test -d $HOME/share/aclocal ; then
        extra="-I $HOME/share/aclocal"
 fi
 
-# I think gettext no longer necessary, as all necessary files imported from coreutils
-#autopoint --force
-aclocal -I m4 $extra
+# This file will be automagically re-generated of present - still looks
+# better than having a versioned file change based on automake version
+touch build-aux/mkinstalldirs
+
+aclocal -I gl/m4 -I m4 $extra
 #libtoolize --force --copy
 autoheader
 automake --add-missing --force-missing --copy
@@ -51,5 +50,5 @@ else
 fi
 
 if [ $docbook = 1 ] ; then
-       cd doc && make
+       ( cd doc && make )
 fi