Fix error message in merge.

[u/mdw/catacomb] / setup

diff --git a/setup b/setup
index c829224..ff17e27 100755 (executable)
--- a/setup
+++ b/setup
@@ -2,9 +2,10 @@
 
 set -e
 mklinks
+libtoolize
 mkaclocal
-autoheader
 m4 Makefile.m4 >Makefile.am
+(cd tests && m4 Makefile.m4 >Makefile.am)
 autoconf
-automake
-mkdir build
+automake -a
+mkdir -p build