[project @ 2001-09-10 12:53:21 by simonmar]

[ghc-hetmet.git] / ghc / compiler / main / SysTools.lhs

diff --git a/ghc/compiler/main/SysTools.lhs b/ghc/compiler/main/SysTools.lhs
index 2e0edd0..4bd3284 100644 (file)
--- a/ghc/compiler/main/SysTools.lhs
+++ b/ghc/compiler/main/SysTools.lhs
@@ -221,7 +221,7 @@ initSysTools minusB_args
                -- NB: top_dir is assumed to be in standard Unix format '/' separated
 
        ; let installed, installed_bin :: FilePath -> FilePath
-              installed_bin pgm   =  pgmPath (top_dir `slash` "extra-bin") pgm
+              installed_bin pgm   =  pgmPath top_dir pgm
              installed     file  =  pgmPath top_dir file
              inplace dir   pgm   =  pgmPath (top_dir `slash` dir) pgm
 
@@ -273,11 +273,12 @@ initSysTools minusB_args
                     destructArray len buf
                     return s
                let
-                 -- strip the trailing slash (awful, but 
+                 -- strip the trailing backslash (awful, but 
                  -- we only do this once).
                  tmpdir =
                    case last tdir of
-                     '/' -> init tdir
+                     '/'  -> init tdir
+                     '\\' -> init tdir
                      _   -> tdir
                setTmpDir tmpdir
                return ())
@@ -791,9 +792,6 @@ subst a b ls = map (\ x -> if x == a then b else x) ls
 slash           :: String -> String -> String
 absPath, relPath :: [String] -> String
 
-isSlash '/'   = True
-isSlash other = False
-
 relPath [] = ""
 relPath xs = foldr1 slash xs