[project @ 2001-07-16 11:08:51 by rrt]

[ghc-hetmet.git] / ghc / driver / PackageSrc.hs

diff --git a/ghc/driver/PackageSrc.hs b/ghc/driver/PackageSrc.hs
index 8a16188..11b4cbf 100644 (file)
--- a/ghc/driver/PackageSrc.hs
+++ b/ghc/driver/PackageSrc.hs
@@ -70,7 +70,11 @@ package_details installing
         extra_libraries   = [ "winmm", "wsock32" ], -- winmm for the threadDelay timer, wsock32 for the linker
 #endif
         include_dirs   = if installing
-                            then [ "$libdir/includes" ]
+                            then [ "$libdir/include"
+#ifdef mingw32_TARGET_OS
+                                , "$libdir/include/mingw"
+#endif
+                                ]
                             else [ ghc_src_dir cGHC_INCLUDE_DIR ],
         c_includes     = [ "Stg.h" ],           -- ha!
         package_deps   = [ "gmp" ],
@@ -316,7 +320,11 @@ package_details installing
                              else [ "$libdir/hslibs/util"
                                   , "$libdir/hslibs/util/cbits" ],
          hs_libraries      = [ "HSutil" ],
-        extra_libraries   = [ "HSutil_cbits" ] ++ words cLibsReadline,
+        extra_libraries   = [ "HSutil_cbits" ] 
+#ifndef mingw32_TARGET_OS
+                             ++ words cLibsReadline
+#endif
+                             ,
          include_dirs   = if installing
                              then []
                              else [ "$libdir/hslibs/util/cbits" ],