X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=tools%2Fsetup;h=6da3f674837f6b7fd787a09560e64a4b725d5845;hb=9faccbb26106fc6f134c783c91d1871af581af02;hp=17eed516eca5b0e068586e97bb711fd266a5fe43;hpb=5778b1890e1c328cb38a5f47e886368ab5793bd8;p=nagiosplug.git

diff --git a/tools/setup b/tools/setup
index 17eed51..6da3f67 100755
--- 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
@@ -24,9 +23,12 @@ if test -d $HOME/share/aclocal ; then
 	extra="-I $HOME/share/aclocal"
 fi
 
-autopoint --force
-aclocal -I m4 $extra
-libtoolize --force --copy
+# 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
 autoconf
@@ -48,5 +50,5 @@ else
 fi
 
 if [ $docbook = 1 ] ; then
-	cd doc && make
+	( cd doc && make )
 fi