projects
/
ghc-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2005-01-28 14:55:05 by simonmar]
[ghc-base.git]
/
package.conf.in
diff --git
a/package.conf.in
b/package.conf.in
index
2ddecaf
..
1596127
100644
(file)
--- a/
package.conf.in
+++ b/
package.conf.in
@@
-39,6
+39,7
@@
exposed-modules:
Data.Dynamic,
Data.Either,
Data.FiniteMap,
Data.Dynamic,
Data.Either,
Data.FiniteMap,
+ Data.FunctorM,
Data.Generics,
Data.Generics.Aliases,
Data.Generics.Basics,
Data.Generics,
Data.Generics.Aliases,
Data.Generics.Basics,
@@
-104,9
+105,9
@@
exposed-modules:
System.Console.GetOpt,
System.CPUTime,
System.Directory,
System.Console.GetOpt,
System.CPUTime,
System.Directory,
+ System.Directory.Internals,
System.Environment,
System.Exit,
System.Environment,
System.Exit,
- System.FilePath,
System.IO,
System.IO.Error,
System.IO.Unsafe,
System.IO,
System.IO.Error,
System.IO.Unsafe,
@@
-162,14
+163,12
@@
hidden-modules:
import-dirs: IMPORT_DIR
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
#endif
-#if !defined(mingw32_TARGET_OS) && !defined(cygwin32_TARGET_OS)
+#if !defined(mingw32_HOST_OS) && !defined(cygwin32_HOST_OS)
hs-libraries: "HSbase"
#else
/*
hs-libraries: "HSbase"
#else
/*
@@
-182,16
+181,11
@@
hs-libraries: "HSbase1", "HSbase2", "HSbase3"
#endif
extra-libs: "HSbase_cbits"
#endif
extra-libs: "HSbase_cbits"
-#if defined(mingw32_TARGET_OS) || defined(__MINGW32__) || defined(_MSC_VER)
+#if defined(mingw32_HOST_OS) || defined(__MINGW32__) || defined(_MSC_VER)
, "wsock32", "msvcrt", "kernel32", "user32", "shell32"
#endif
, "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:
includes: HsBase.h
depends: rts
extra-hugs-opts:
@@
-199,5
+193,5
@@
extra-cc-opts:
extra-ld-opts:
framework-dirs:
extra-frameworks:
extra-ld-opts:
framework-dirs:
extra-frameworks:
-haddock-interfaces:
-haddock-html:
+haddock-interfaces: HADDOCK_IFACE
+haddock-html: HTML_DIR