X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=package.conf.in;h=11eaa390d5bca60cfa2dcd96dd00be8b2849bfcf;hb=c1a7d1856f1af6450ae3e04072b9d36960bc2257;hp=a1c217877ecb81ebb954ce320374391f90176693;hpb=4c31d64b42b37e76b5117dbd2285fdead9cf1ce2;p=haskell-directory.git

diff --git a/package.conf.in b/package.conf.in
index a1c2178..11eaa39 100644
--- a/package.conf.in
+++ b/package.conf.in
@@ -7,6 +7,7 @@ maintainer:	libraries@haskell.org
 exposed:	True
 
 exposed-modules:
+	Control.Applicative,
 	Control.Arrow,
 	Control.Concurrent,
 	Control.Concurrent.Chan,
@@ -17,6 +18,7 @@ exposed-modules:
 	Control.Exception,
 	Control.Monad,
 	Control.Monad.Fix,
+	Control.Monad.Instances,
 	Control.Monad.ST,
 	Control.Monad.ST.Lazy,
 	Control.Monad.ST.Strict,
@@ -34,11 +36,20 @@ exposed-modules:
 	Data.Array.Unboxed,
 	Data.Bits,
 	Data.Bool,
+	Data.ByteString,
+	Data.ByteString.Char8,
+    Data.ByteString.Lazy
+    Data.ByteString.Lazy.Char8
+    Data.ByteString.Base
+    Data.ByteString.Fusion
 	Data.Char,
 	Data.Complex,
 	Data.Dynamic,
 	Data.Either,
-	Data.FiniteMap,
+	Data.Eq,
+	Data.Fixed,
+	Data.Foldable,
+	Data.FunctorM,
 	Data.Generics,
 	Data.Generics.Aliases,
 	Data.Generics.Basics,
@@ -50,17 +61,23 @@ exposed-modules:
 	Data.HashTable,
 	Data.IORef,
 	Data.Int,
+	Data.IntMap,
+	Data.IntSet,
 	Data.Ix,
 	Data.List,
 	Data.Maybe,
+	Data.Map,
 	Data.Monoid,
+	Data.Ord,
 	Data.PackedString,
 	Data.Queue,
 	Data.Ratio,
 	Data.STRef,
 	Data.STRef.Lazy,
 	Data.STRef.Strict,
+	Data.Sequence,
 	Data.Set,
+	Data.Traversable,
 	Data.Tree,
 	Data.Tuple,
 	Data.Typeable,
@@ -86,6 +103,7 @@ exposed-modules:
 	Foreign.Storable,
 	GHC.ConsoleHandler,
 	GHC.Dotnet,
+	GHC.Dynamic,
 	GHC.Exts,
 	GHC.ForeignPtr,
 	GHC.Handle,
@@ -101,9 +119,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,
@@ -119,8 +137,6 @@ exposed-modules:
 	System.Process.Internals,
 	System.Random,
 	System.Time,
-	Text.Html,
-	Text.Html.BlockTable,
 	Text.ParserCombinators.ReadP,
 	Text.ParserCombinators.ReadPrec,
 	Text.PrettyPrint,
@@ -128,8 +144,6 @@ exposed-modules:
 	Text.Printf,
 	Text.Read,
 	Text.Read.Lex,
-	Text.Regex,
-	Text.Regex.Posix,
 	Text.Show,
 	Text.Show.Functions,
 	GHC.Arr,
@@ -143,6 +157,7 @@ exposed-modules:
 	GHC.List,
 	GHC.Num,
 	GHC.Pack,
+	GHC.Prim,
 	GHC.Ptr,
 	GHC.Read,
 	GHC.Real,
@@ -158,42 +173,25 @@ 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)
 hs-libraries:   "HSbase"
-#else
-/*
- 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.
-*/
-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