X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=package.conf.in;h=91a64ce48cac520e970befcf81eda1665affd551;hb=88b22778e7c06909683b493e037605a249ae37ad;hp=2ddecaf7653665c4b2304a9676013a71a5ac9934;hpb=bbbba97cbcf12039810533e3a2daf2eefdefe7f0;p=ghc-base.git

diff --git a/package.conf.in b/package.conf.in
index 2ddecaf..91a64ce 100644
--- 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,
@@ -104,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,
@@ -162,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
 /*
@@ -181,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