[project @ 2005-03-02 13:11:00 by simonmar]

[ghc-base.git] / package.conf.in

diff --git a/package.conf.in b/package.conf.in
index a1c2178..91a64ce 100644 (file)
--- a/package.conf.in
+++ b/package.conf.in
@@ -39,6 +39,7 @@ exposed-modules:
        Data.Dynamic,
        Data.Either,
        Data.FiniteMap,
+       Data.FunctorM,
        Data.Generics,
        Data.Generics.Aliases,
        Data.Generics.Basics,
@@ -50,9 +51,12 @@ exposed-modules:
        Data.HashTable,
        Data.IORef,
        Data.Int,
+       Data.IntMap,
+       Data.IntSet,
        Data.Ix,
        Data.List,
        Data.Maybe,
+       Data.Map,
        Data.Monoid,
        Data.PackedString,
        Data.Queue,
@@ -101,9 +105,9 @@ exposed-modules:
        System.Console.GetOpt,
        System.CPUTime,
        System.Directory,
+       System.Directory.Internals,
        System.Environment,
        System.Exit,
-       System.FilePath,
        System.IO,
        System.IO.Error,
        System.IO.Unsafe,
@@ -143,6 +147,7 @@ exposed-modules:
        GHC.List,
        GHC.Num,
        GHC.Pack,
+       GHC.Prim,
        GHC.Ptr,
        GHC.Read,
        GHC.Real,
@@ -158,14 +163,12 @@ hidden-modules:
 
 import-dirs:   IMPORT_DIR
 
-#ifdef INSTALLING
-library-dirs:  "$libdir"
-#else
-library-dirs:  "$libdir/libraries/base",
-               "$libdir/libraries/base/cbits"
+library-dirs:  LIB_DIR
+#ifndef INSTALLING
+               , LIB_DIR"/cbits"
 #endif
 
-#if !defined(mingw32_TARGET_OS) && !defined(cygwin32_TARGET_OS)
+#if !defined(mingw32_HOST_OS) && !defined(cygwin32_HOST_OS)
 hs-libraries:   "HSbase"
 #else
 /*
@@ -177,23 +180,18 @@ hs-libraries:   "HSbase"
 hs-libraries:  "HSbase1", "HSbase2", "HSbase3"
 #endif
 
-extra-libs:  "HSbase_cbits"
-#if defined(mingw32_TARGET_OS) || defined(__MINGW32__) || defined(_MSC_VER)
+extra-libraries:  "HSbase_cbits"
+#if defined(mingw32_HOST_OS) || defined(__MINGW32__) || defined(_MSC_VER)
             , "wsock32", "msvcrt", "kernel32", "user32", "shell32"
 #endif
 
-#ifdef INSTALLING
-include-dirs:
-#else
-include-dirs: "$libdir/libraries/base/include"
-#endif
-
+include-dirs:          INCLUDE_DIR
 includes:              HsBase.h
 depends:               rts
-extra-hugs-opts:
-extra-cc-opts:
-extra-ld-opts:
+hugs-options:
+cc-options:
+ld-options:
 framework-dirs:
-extra-frameworks:
-haddock-interfaces:
-haddock-html:
+frameworks:
+haddock-interfaces:    HADDOCK_IFACE
+haddock-html:          HTML_DIR