[project @ 1999-12-03 16:59:17 by simonmar]

Add Andy Gill's Monad library into the build.

diff --git a/ghc/driver/ghc.lprl b/ghc/driver/ghc.lprl
index adfe149..ec49525 100644 (file)
--- a/ghc/driver/ghc.lprl
+++ b/ghc/driver/ghc.lprl
@@ -2499,7 +2499,7 @@ sub add_syslib {
        [  # where to slurp interface files from
          ( $INSTALLING 
               ? "$InstLibDirGhc/imports/lang"
-              : "$TopPwd/hslibs/lang"
+              : "$TopPwd/hslibs/lang:$TopPwd/hslibs/lang/monads"
          )
        , # where to find the archive to use when linking
          ( $INSTALLING 

diff --git a/ghc/utils/mkdependHS/mkdependHS.prl b/ghc/utils/mkdependHS/mkdependHS.prl
index 73d2d0b..c27fd17 100644 (file)
--- a/ghc/utils/mkdependHS/mkdependHS.prl
+++ b/ghc/utils/mkdependHS/mkdependHS.prl
@@ -322,6 +322,9 @@ sub gather_import_dirs {
           local($dir);
 
            # Yuck ^ 2
+           if ( $lib eq 'lang' && ! $INSTALLING ) {
+              push(@Import_dirs, "${TopPwd}/hslibs/${lib}/monads");
+          }
            if ( $lib eq 'text' && ! $INSTALLING ) {
               push(@Import_dirs, "${TopPwd}/hslibs/${lib}/html");
           }