From 21dc55788a15166b00f3e653ebd70a22e27c9d1a Mon Sep 17 00:00:00 2001 From: ijones <ijones@syntaxpolice.org> Date: Mon, 18 Jul 2005 04:47:52 +0000 Subject: [PATCH] tweak to Configure for windows. removed DefaultSetup since it breaks windows cabal 1.0 installations. --- Cabal.cabal | 32 ---------------------------- src/Distribution/Simple/Configure.hs | 2 +- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/Cabal.cabal b/Cabal.cabal index 7c00a51c46..2fc742366f 100644 --- a/Cabal.cabal +++ b/Cabal.cabal @@ -49,35 +49,3 @@ Other-Modules: Distribution.Compat.Exception, Distribution.Compat.RawSystem Extensions: CPP - -executable: cabal-setup -main-is: DefaultSetup.lhs -hs-source-dir: src -Other-Modules: - Distribution.Compat.ReadP, - Distribution.Extension, - Distribution.InstalledPackageInfo, - Distribution.License, - Distribution.Make, - Distribution.Package, - Distribution.PackageDescription, - Distribution.ParseUtils, - Distribution.PreProcess, - Distribution.PreProcess.Unlit, - Distribution.Setup, - Distribution.Simple, - Distribution.Simple.Build, - Distribution.Simple.Configure, - Distribution.Simple.GHCPackageConfig, - Distribution.Simple.Install, - Distribution.Simple.LocalBuildInfo, - Distribution.Simple.Register, - Distribution.Simple.SrcDist, - Distribution.Simple.Utils, - Distribution.Compat.FilePath, - Distribution.Version, - Distribution.GetOpt, - Distribution.Compat.Directory, - Distribution.Compat.Exception, - Distribution.Compat.RawSystem -Extensions: CPP diff --git a/src/Distribution/Simple/Configure.hs b/src/Distribution/Simple/Configure.hs index d38d081269..cc4b94b5b9 100644 --- a/src/Distribution/Simple/Configure.hs +++ b/src/Distribution/Simple/Configure.hs @@ -253,7 +253,7 @@ system_default_prefix = csidl_PROGRAM_FILES = 0x0026 long_path_size = 1024 -foreign import stdcall unsafe "SHGetFolderPath" +foreign import stdcall unsafe "SHGetFolderPathW" c_SHGetFolderPath :: Ptr () -> CInt -> Ptr () -- GitLab