X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=base.conf.in;h=c490b41d01071d7d90bce8b18fe42423b23ec372;hb=81ef48b033c9d5bc6ee6e257ec51141e659b8532;hp=0a6a74b88501fc974ee1921fb3f672ef9dcb0583;hpb=6679033059077ab7ceb19540a8801d812e939e4e;p=ghc-base.git

diff --git a/base.conf.in b/base.conf.in
index 0a6a74b..c490b41 100644
--- a/base.conf.in
+++ b/base.conf.in
@@ -3,26 +3,26 @@
 Package {
         name           = "base",
 #ifdef INSTALLING
-	import_dirs    = [ "$libdir/imports" ]
+	import_dirs    = [ "$libdir/imports/base" ],
 #else
 	import_dirs    = [ "$libdir/libraries/base" ],
 #endif
         source_dirs    = [],
 #ifdef INSTALLING
-        library_dirs   = [ "$libdir" ]
+        library_dirs   = [ "$libdir" ],
 #else
         library_dirs   = [ "$libdir/libraries/base"
                          , "$libdir/libraries/base/cbits" ],
 #endif
         hs_libraries      =
-#                           ifndef mingw32_TARGET_OS
+#                           if !defined(mingw32_TARGET_OS) && !defined(cygwin32_TARGET_OS)
                             [ "HSbase" ],
 #                           else
-                            -- This splitting is the subject of a totally 
-                            -- horrible hack, which glues HSstd1 and HSstd2 
-                            -- back into HSstd for the purposes of static linking.
-                            -- See DriverState.getPackageLibraries for details.
-                            [ "HSbase1", "HSbase2" ],
+                            /* This splitting is the subject of a totally 
+                               horrible hack, which glues HSbase{1,2,3}
+                               back into HSbaase for the purposes of static linking.
+                               See DriverState.getPackageLibraries for details. */
+                            [ "HSbase1", "HSbase2", "HSbase3" ],
 #                           endif
 	extra_libraries   = [ "HSbase_cbits"
 #ifdef mingw32_TARGET_OS
@@ -30,7 +30,7 @@ Package {
 #endif
 			    ],
 #ifdef INSTALLING
-        include_dirs   = []
+        include_dirs   = [],
 #else
         include_dirs   = [ "$libdir/libraries/base/include" ],
 #endif