made Distribution.Make compile, clean makefile a bit

Distribution/Make.hs

@@ -59,7 +59,7 @@ import Distribution.Version (Version(..))
 -- Base
 import System(getArgs)
 
-import Control.Monad (when, unless)
+import Control.Monad (when)
 import Data.Maybe (isNothing, maybe)
 import Data.List	( intersperse )
 import System.IO (hPutStr, stderr)

Distribution/ModuleTest.hs

@@ -49,6 +49,7 @@ module Main where
 import qualified Distribution.Version as D.V (hunitTests)
 -- import qualified Distribution.InstalledPackageInfo(hunitTests)
 import qualified Distribution.Misc as D.M (hunitTests)
+import qualified Distribution.Make ()
 import qualified Distribution.Package as D.P (hunitTests)
 import qualified Distribution.Setup as D.Setup (hunitTests)
 

Distribution/Simple/Utils.hs

@@ -52,6 +52,7 @@ module Distribution.Simple.Utils (
 	findBinary,
 	rawSystemPath,
 	rawSystemExit,
+        maybeExit,
 	rawSystemPathExit,
         moveSources,
         hunitTests,

Makefile

 all: main
 
 main:
-	ghc -Wall --make -i../:/usr/local/src/HUnit-1.0 Distribution/ModuleTest -o moduleTest
+	ghc -Wall --make -i../:test/HUnit-1.0/src Distribution/ModuleTest -o moduleTest
+
 tests:
 	cd test/A && make
 	cd test/HUnit-1.0 && make
 
 clean:
 	-rm -f Distribution/*.{o,hi} Distribution/Simple/*.{o,hi} 
-	rm -f library-infrastructure--darcs.tar.gz
+	-rm -f library-infrastructure--darcs.tar.gz
 
 check: tests main
 	./moduleTest