Build, but don't install cabal-setup

It turns out that the cabal02 test is testing cabal-setup, so it helps
to actually have it built.

Makefile

@@ -194,7 +194,7 @@ else # boilerplate.mk exists
 
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS = doc #cabal-setup
+SUBDIRS = doc cabal-setup
 
 ALL_DIRS = \
 	Distribution \

cabal-setup/Makefile

@@ -14,7 +14,8 @@ HS_PROG 	= cabal-setup
 EXCLUDED_SRCS 	= Setup.hs
 SRC_HC_OPTS 	+= -package Cabal
 
-INSTALL_PROGS	+= $(HS_PROG)
+# Don't install this yet, it isn't ready
+# INSTALL_PROGS	+= $(HS_PROG)
 
 include $(TOP)/mk/target.mk