X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure;h=a7398f3a24fb4f814589fb40757f903b32be9125;hp=bc74eab42f895cae420588844b96a013a3cb8d1e;hb=bb8c11821cc88fef9da474587cc42e0f7554cf28;hpb=e994b20fed384f82a849a5254634c7809ec0f83a

diff --git a/configure b/configure
index bc74eab..a7398f3 100755
--- a/configure
+++ b/configure
@@ -12,7 +12,6 @@ do_makefile() {
         *)        echo "cannot guess deepness of '$dir'"; exit 1
     esac
     echo "all %: ; @\$(MAKE) -s -C $rel/build/$dir \$*" >  $dir/Makefile
-    echo "-include \$(wildcard *.mk)"                   >> $dir/Makefile
 }
 
 find . -name CMakeLists.txt | while read file; do do_makefile $file; done
@@ -20,10 +19,13 @@ find . -name CMakeLists.txt | while read file; do do_makefile $file; done
 builddir=.build-$(hostname)-$(gcc -dumpmachine)-$(gcc -dumpversion)
 rm -rf $builddir
 mkdir -p $builddir
-ln -s $builddir build
+rm -f build && ln -s $builddir build
+rm -f madmutt && ln -s $builddir/madmutt madmutt
 
 if test $# -eq 0; then
-    cd $builddir && cmake -DWITH_NNTP=1 -DWITH_IDN=1 -DUSE_HCACHE=1 -DWITH_LIBESMTP=1 --with-prefix=/usr ..
+    (cd $builddir && cmake -DWITH_NNTP=1 -DWITH_IDN=1 -DUSE_HCACHE=1 -DCMAKE_INSTALL_PREFIX=/usr ..)
 else
-    cd $builddir && cmake "$@" ..
+    (cd $builddir && cmake "$@" ..)
 fi
+
+make -C tools