[project @ 2000-05-10 16:51:52 by sewardj]

[ghc-hetmet.git] / ghc / interpreter / machdep.c

diff --git a/ghc/interpreter/machdep.c b/ghc/interpreter/machdep.c
index c24076e..158fcf6 100644 (file)
--- a/ghc/interpreter/machdep.c
+++ b/ghc/interpreter/machdep.c
@@ -13,8 +13,8 @@
  * included in the distribution.
  *
  * $RCSfile: machdep.c,v $
- * $Revision: 1.29 $
- * $Date: 2000/04/10 15:39:09 $
+ * $Revision: 1.31 $
+ * $Date: 2000/05/10 16:51:52 $
  * ------------------------------------------------------------------------*/
 
 #ifdef HAVE_SIGNAL_H
@@ -207,12 +207,12 @@ static Void   local searchStr     ( String );
 static Bool   local tryEndings    ( String );
 
 #if (DOS_FILENAMES || __CYGWIN32__) 
-# define SLASH                   '\\'
-# define SLASH_STR               "\\"
+# define SLASH                   '/'
+# define SLASH_STR               "/"
 # define isSLASH(c)              ((c)=='\\' || (c)=='/')
 # define PATHSEP                 ';'
 # define PATHSEP_STR             ";"
-# define DLL_ENDING              ".dll"
+# define DLL_ENDING              ".u_o"
 #elif MAC_FILENAMES
 # define SLASH                   ':'
 # define isSLASH(c)              ((c)==SLASH)
@@ -628,11 +628,6 @@ Bool findFilesForModule (
       internal("moduleNameToFileNames: malloc failed(2)");
 
    augdPath[0] = 0;
-   strcat(augdPath, ".");
-   strcat(augdPath, PATHSEP_STR);
-
-   strcat(augdPath, hugsPath);
-   strcat(augdPath, PATHSEP_STR);
 
    if (combined) {
       strcat(augdPath, installDir);
@@ -648,6 +643,13 @@ Bool findFilesForModule (
    strcat(augdPath, "lib");
    strcat(augdPath, PATHSEP_STR);
 
+   /* these two were previously before the above `if' */
+   strcat(augdPath, ".");
+   strcat(augdPath, PATHSEP_STR);
+
+   strcat(augdPath, hugsPath);
+   strcat(augdPath, PATHSEP_STR);
+
    /* fprintf ( stderr, "augdpath = `%s'\n", augdPath ); */
 
    peEnd = augdPath-1;