Renamed altered tap file to nagios-plugins

[nagiosplug.git] / tools / setup

diff --git a/tools/setup b/tools/setup
index 501ae2095c7c921c65c703010dd944de336d371b..866664e6bf387098006c52dde91f4f2ccb0b98c7 100755 (executable)
--- a/tools/setup
+++ b/tools/setup
@@ -18,18 +18,14 @@ else
        echo Found GNU Make at $MAKE ... good.
 fi
 
-( cd m4 && $MAKE -f Makefile.am Makefile.am.in )
-
 # 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
-libtoolize --force --copy
+aclocal -I gl/m4 -I m4 $extra
+#libtoolize --force --copy
 autoheader
 automake --add-missing --force-missing --copy
 autoconf
@@ -51,5 +47,8 @@ else
 fi
 
 if [ $docbook = 1 ] ; then
-       cd doc && make
+       ( cd doc && make )
 fi
+
+# Untar libtap
+( cd external && tar --gzip -xf tap-1.01-nagios-plugins.tar.gz )