From 3f0474cf1aefec7a2b3dae76c2b754a92da8b8b2 Mon Sep 17 00:00:00 2001 From: Duncan Coutts Date: Mon, 22 Oct 2007 13:27:08 +0000 Subject: [PATCH] Clean up .cabal file a bit specify build-type and cabal-version >= 1.2 put extra-tmp-files in the right place use os(windows) rather than os(mingw32) --- base.cabal | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/base.cabal b/base.cabal index 4a08fae..687b04b 100644 --- a/base.cabal +++ b/base.cabal @@ -8,9 +8,12 @@ description: This package contains the Prelude and its support libraries, and a large collection of useful libraries ranging from data structures to parsing combinators and debugging utilities. +cabal-version: >=1.2 +build-type: Custom extra-tmp-files: config.log config.status autom4te.cache - include/HsBaseConfig.h GHC/Prim.hs GHC/PrimopWrappers.hs + include/HsBaseConfig.h + Library { -- This is actually something of a hack, as if we are using @@ -160,7 +163,7 @@ Library { include-dirs: include includes: HsBase.h install-includes: HsBase.h HsBaseConfig.h WCsubst.h dirUtils.h lockFile.h consUtils.h Typeable.h - if os(mingw32) { + if os(windows) { extra-libraries: wsock32, msvcrt, kernel32, user32, shell32 } extensions: CPP @@ -170,4 +173,3 @@ Library { ghc-options: -fglasgow-exts -package-name base nhc98-options: -H4M -K3M } - -- 1.7.10.4