--- a/Makefile.am	Thu Oct 09 09:48:59 2008 +0000
+++ b/Makefile.am	Thu Oct 09 13:23:07 2008 +0000
@@ -35,8 +35,11 @@
     devices \
     include \
     master \
-    script \
-    tool
+    script
+
+if BUILD_TOOL
+SUBDIRS += tool
+endif
 
 if ENABLE_USERLIB
 SUBDIRS += lib