X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=MakeMakefile;h=a95542e4da8006f55e3ef57fb4b5641fd82af9e4;hp=517c3569bb26b4903751d002f6cbdc7ccb5c90a9;hb=2f9c0721d1f7e9eceae3d04e197d0e4a46eeb3b1;hpb=5d6ac2b0da659a2a0dc5640d628d4ff24696ff29;ds=sidebyside

diff --git a/MakeMakefile b/MakeMakefile
index 517c356..a95542e 100755
--- a/MakeMakefile
+++ b/MakeMakefile
@@ -3,6 +3,9 @@
 # Run this script after the first cvs checkout to build
 # makefiles and friends
 
+PATH="/usr/sepp/bin:$PATH"
+export PATH
+
 vcheck (){
   perl <<PERL
 @t = split /\./, "$1";
@@ -29,7 +32,10 @@ then
     ERROR=1
   else
     automake=automake-1.9
-    aclocal="aclocal-1.9 -I/usr/pack/automake-1.9.5-to/share/aclocal-1.9/ -I/usr/share/aclocal-1.9/"
+    aclocal="aclocal-1.9"
+    for d in /usr/pack/automake-1.9.5-to/share/aclocal-1.9 /usr/share/aclocal-1.9 /usr/pack/rrdtool-1.3svn-to/share/aclocal /usr/pack/intltool-0.37.0-to/share/aclocal ; do
+      [ -d $d ] && aclocal="$aclocal -I $d"
+    done
   fi
 else
     automake="automake"
@@ -50,18 +56,16 @@ fi
 
 # cleanup
 set -x
-find . -name Makefile | xargs rm -f _UNKNONW_
-find . -name "*.la" | xargs rm -f
+find . -name Makefile | grep -v win32 | grep -v netware | xargs rm -f _UNKNONW_
+find . -name "*.la" | xargs rm -f _UNKNOWN_
 find . -name Makefile.in | xargs rm -f _UNKNONW_
 find . -name .libs | xargs rm -r 
 find . -name .debs | xargs rm -r
 
+intltoolize --automake -c -f
 $aclocal
 libtoolize --copy --force
-autoheader --warnings=all --force  
+autoheader --force  
 $aclocal
-$automake --foreign --add-missing --force-missing --copy --warnings=all
-autoconf --warnings=all --force
-# one again to make every body happy
-
-autoreconf
+$automake --foreign --add-missing --force-missing --copy 
+autoconf --force