X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=MakeMakefile;h=2765238a7ddf1dfe6e25eb1391c238f28204c359;hp=ba642cf92a2aa6f2fc369078b38c9bb910219556;hb=f942d3c825ad1073bb6d68edd9653b0c999bbe49;hpb=cbb3228d48d37485dbf539289b5ad685073416d9

diff --git a/MakeMakefile b/MakeMakefile
index ba642cf..2765238 100755
--- a/MakeMakefile
+++ b/MakeMakefile
@@ -3,8 +3,8 @@
 # Run this script after the first cvs checkout to build
 # makefiles and friends
 
-PATH="/usr/sepp/bin:$PATH"
-export PATH
+#PATH="/usr/sepp/bin:$PATH"
+#export PATH
 
 vcheck (){
   perl <<PERL
@@ -17,23 +17,27 @@ PERL
 }
 
 ERROR=0
+LIBTOOL_VER="1.5.6"
+AUTOMAKE_VER="1.9.2"
+AUTOCONF_VER="2.59"
+INTLTOOL_VER="0.35.0"
 
-if vcheck 1.5.14 "libtool --version"
+if vcheck $LIBTOOL_VER "libtool --version"
 then
-  echo "get a copy of GNU libtool >= 1.5.14"
+  echo "get a copy of GNU libtool >= $LIBTOOL_VER"
   ERROR=1
 fi
 
-if vcheck 1.9.5  "automake  --version"
+if vcheck $AUTOMAKE_VER  "automake  --version"
 then
-  if vcheck 1.9.5  "automake-1.9 --version"
+  if vcheck $AUTOMAKE_VER  "automake-1.9 --version"
   then
-    echo "get a copy of GNU automake >= 1.9.5"
+    echo "get a copy of GNU automake >= $AUTOMAKE_VER"
     ERROR=1
   else
     automake=automake-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
+    for d in /usr/pack/automake-1.9.5-to/share/aclocal-1.9 /usr/share/aclocal-1.9 /usr/share/aclocal /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
@@ -43,15 +47,15 @@ else
 #    aclocal="aclocal -I /usr/pack/libtool-1.5.14-to/share/aclocal"
 fi
 
-if vcheck 2.59 "autoconf --version"
+if vcheck $AUTOCONF_VER "autoconf --version"
 then
-  echo "get a copy of GNU autoconf >= 2.59"
+  echo "get a copy of GNU autoconf >= $autoconf_ver"
   ERROR=1
 fi
 
-if vcheck 0.35.0 "intltoolize --version"
+if vcheck $INTLTOOL_VER "intltoolize --version"
 then
-  echo "get a copy of GNU intltoolize >= 0.35.0"
+  echo "get a copy of GNU intltoolize >= $INTLTOOL_VER"
   ERROR=1
 fi
 	
@@ -60,12 +64,21 @@ then
   exit 1
 fi
 
-# cleanup
-if [ -e Makefile ]
-then
-  make clean >/dev/null
-fi
+# remove the bits we are going to recreate
 
+echo Removing old Makefiles
+touch Makefile
+find . -name "Makefile" -or -name "Makefile.in" -print0 | xargs -0 rm 
+echo Cleaning out other leftovers
+for x in configure install-sh intltool-merge.in rrd_config.h.in \
+         missing intltool-update po/Makefile.in.in config.sub \
+         intltool-extract intltool-extract.in config.guess \
+         depcomp intltool-update.in autom4te.cache \
+         intltool-merge compile; do
+  [ ! -L $x -a -d $x ] && rm -r "$x"
+  [ ! -L $x -a -f $x ] && rm "$x"
+done
+set -x
 intltoolize --automake -c -f
 $aclocal
 libtoolize --copy --force