From: simonmar <unknown>
Date: Fri, 3 Dec 1999 16:59:18 +0000 (+0000)
Subject: [project @ 1999-12-03 16:59:17 by simonmar]
X-Git-Tag: Approximately_9120_patches~5435
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=0f485f6ecfb4442a0132522303973ee1f7b0375e;p=ghc-hetmet.git

[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
--- 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
--- 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");
 	   }