X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=MakeMakefile;h=026f0a9d7d24a50a2ff06bf8a7f5efb975f6f93f;hb=8fafd09727d58545c1229ca84b94f0082af6a528;hp=f15fdcb416ca97559990fae49160b8358fddc3b5;hpb=e6f4a8883a792b07376270e318689f9d24b21d3c;p=rrdtool.git

diff --git a/MakeMakefile b/MakeMakefile
index f15fdcb..026f0a9 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  --acdir=/usr/share/aclocal-1.9 -I /usr/share/aclocal/"
+    aclocal="aclocal-1.9"
+    for d in /usr/pack/automake-1.9.5-to/share/aclocal-1.9 /usr/share/aclocal-1.9; 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 --force  
 $aclocal
-autoheader --warnings=all --force  
-$automake --foreign --add-missing --force-missing --copy --warnings=all
-autoconf --warnings=all --force
-#rm config.h.in
-#autoheader --warnings=all --force  
-
-
+$automake --foreign --add-missing --force-missing --copy 
+autoconf --force