From 16ba3527540ae9b3c60da456e93cb3ee94b4c1ea Mon Sep 17 00:00:00 2001
From: ijones <ijones@syntaxpolice.org>
Date: Tue, 19 Jul 2005 06:21:32 +0000
Subject: [PATCH] more changes relating to src move
---
Cabal.cabal | 1 -
Distribution/Simple/Utils.hs | 2 +-
tests/Tests.mk | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Cabal.cabal b/Cabal.cabal
index 2fc742366f..8e4c1e457b 100644
--- a/Cabal.cabal
+++ b/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
diff --git a/Distribution/Simple/Utils.hs b/Distribution/Simple/Utils.hs
index a3c6300c95..826e8dcb66 100644
--- a/Distribution/Simple/Utils.hs
+++ b/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
diff --git a/tests/Tests.mk b/tests/Tests.mk
index 9227f2c51a..be5b295cda 100644
--- a/tests/Tests.mk
+++ b/tests/Tests.mk
@@ -1,7 +1,7 @@
#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
--
GitLab