[project @ 1999-12-07 13:04:31 by panne]

[ghc-hetmet.git] / ghc / utils / mkdependHS / mkdependHS.prl

diff --git a/ghc/utils/mkdependHS/mkdependHS.prl b/ghc/utils/mkdependHS/mkdependHS.prl
index b75cd48..13052db 100644 (file)
--- a/ghc/utils/mkdependHS/mkdependHS.prl
+++ b/ghc/utils/mkdependHS/mkdependHS.prl
@@ -233,7 +233,7 @@ sub mangle_command_line_args {
        } elsif ( /^-syslib$/ ) {
            push(@Syslibs, &grab_arg_arg(*Args,$_,''));
        } elsif ( /^-fglasgow-exts$/ ) {
-           push(@Syslibs, 'exts');
+           push(@Syslibs, 'lang');
        } elsif ( /^-concurrent$/ ) {
            push(@Syslibs, 'concurrent');
        } elsif (/^-#include(.*)/) {
@@ -322,13 +322,27 @@ 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");
+          }
+           if ( $lib eq 'data' && ! $INSTALLING ) {
+              push(@Import_dirs, "${TopPwd}/hslibs/${lib}/edison");
+              push(@Import_dirs, "${TopPwd}/hslibs/${lib}/edison/Assoc");
+              push(@Import_dirs, "${TopPwd}/hslibs/${lib}/edison/Coll");
+              push(@Import_dirs, "${TopPwd}/hslibs/${lib}/edison/Seq");
+          }
+
+           # Yuck ^ 3
            if ( $lib eq 'win32' && ! $INSTALLING ) {
               $dir = "${TopPwd}/hslibs/${lib}/src";
            } elsif ( $lib eq 'com' && ! $INSTALLING ) {
-              $dir = "${TopPwd}/hdirect/lib";
+              $dir = "${TopPwd}/hslibs/lib";
            } else {
               $dir = ($INSTALLING) ? "${InstLibDirGhc}/imports/${lib}" 
-                                  : "${TopPwd}/ghc/lib/${lib}";
+                                  : "${TopPwd}/hslibs/${lib}";
            }
           if (!$Include_prelude) {
               push(@Ignore_dirs,$dir);
@@ -420,7 +434,7 @@ sub slurp_file_for_imports {
     if ($options ne "") {
       @Old_Syslibs=@Syslibs;
       $ProcessingOptions=1;
-      &mangle_command_line_args(split(/ /,$options));
+      &mangle_command_line_args(split(/\s+/,$options));
       if (@Old_Syslibs ne @Syslibs) {
         $found_options=1;
        @Old_Ignore_dirs = @Ignore_dirs;