From: sof <unknown>
Date: Tue, 4 Jun 2002 19:13:31 +0000 (+0000)
Subject: [project @ 2002-06-04 19:13:31 by sof]
X-Git-Tag: nhc98-1-18-release~987
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=af8b437898724147a707bb747716a628acf668dd;p=haskell-directory.git

[project @ 2002-06-04 19:13:31 by sof]
Adjust to three-way split of HSbase + accommodate cygwin.
---

diff --git a/base.conf.in b/base.conf.in
index 7430ecb..46d92fc 100644
--- a/base.conf.in
+++ b/base.conf.in
@@ -15,19 +15,22 @@ Package {
                          , "$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.
+                               horrible hack, which glues HSbase{1,2,3}
+                               back into HSbaase for the purposes of static linking.
                                See DriverState.getPackageLibraries for details. */
-                            [ "HSbase1", "HSbase2" ],
+                            [ "HSbase1", "HSbase2", "HSbase3" ],
 #                           endif
 	extra_libraries   = [ "HSbase_cbits"
 #ifdef mingw32_TARGET_OS
                             , "wsock32", "msvcrt", "kernel32", "user32"
 #endif
+#ifdef mingw32_TARGET_OS
+			    , "kernel32", "user32"
+#endif
 			    ],
 #ifdef INSTALLING
         include_dirs   = [],