move autopoint to start of gnu toolchain setup

use --force-missing instead on manually copying files
 (manual process was broken on RedHat, and we should expect automake to do its job right anyway)


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@614 f882894a-f735-0410-b71e-b25c423dba1c

1 files changed, 2 insertions, 11 deletions

diff --git a/tools/setup b/tools/setup
index 6f3fdee9..a90d48aa 100755
--- a/tools/setup
+++ b/tools/setup
@@ -18,20 +18,11 @@ else
         echo Found GNU Make at $MAKE ... good.
 fi
 
-# Refresh GNU autotools toolchain.
-for i in config.guess config.sub missing install-sh mkinstalldirs ; do
-        test -r /usr/share/automake/${i} && {
-                rm -f ${i}
-                cp /usr/share/automake/${i} .
-        }
-        chmod 755 ${i}
-done
-
+autopoint --force
 aclocal -I lib
 autoheader
-automake --add-missing --copy
+automake --add-missing --force-missing
 autoconf
-autopoint --force
 
 if [ -f debian/rules ] ; then
   chmod +x debian/rules