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

diff --git a/MakeMakefile b/MakeMakefile
index ba642cf..aca14cc 100755
--- a/MakeMakefile
+++ b/MakeMakefile
@@ -33,7 +33,7 @@ then
   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
@@ -60,12 +60,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