more changes relating to src move

Cabal.cabal

@@ -5,7 +5,6 @@ Build-Depends: base, util
 License: BSD3
 License-File: LICENSE
 Author: Isaac Jones <ijones@syntaxpolice.org>
-hs-source-dir: src
 Maintainer: Isaac Jones <ijones@syntaxpolice.org>
 Homepage: http://www.haskell.org/cabal/
 Synopsis: A framework for packaging Haskell software

Distribution/Simple/Utils.hs

@@ -387,7 +387,7 @@ hunitTests
     = let suffixes = ["hs", "lhs"]
           in [TestCase $
 #ifdef mingw32_TARGET_OS
-       do mp1 <- moduleToFilePath ["src"] "Distribution.Simple.Build" suffixes --exists
+       do mp1 <- moduleToFilePath [""] "Distribution.Simple.Build" suffixes --exists
           mp2 <- moduleToFilePath [""] "Foo.Bar" suffixes    -- doesn't exist
           assertEqual "existing not found failed"
                    (Just "Distribution\\Simple\\Build.hs") mp1

tests/Tests.mk

 #HC=/tmp/ghc/bin/ghc
 HC=ghc
 setup: Setup.lhs
-	$(HC) -cpp --make -i../../src Setup.lhs -o setup 2>out.build
+	$(HC) -cpp --make -i../.. Setup.lhs -o setup 2>out.build
 clean:
 	rm -f setup a.out .setup-config register.sh unregister.sh out.build
 	rm -rf ,tmp* dist