projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[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
20a8099
..
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
-- 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
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
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
-- we only do this once).
tmpdir =
case last tdir of
- '/' -> init tdir
+ '/' -> init tdir
+ '\\' -> init tdir
_ -> tdir
setTmpDir tmpdir
return ())
_ -> tdir
setTmpDir tmpdir
return ())