From: Ian Lynagh <igloo@earth.li>
Date: Sat, 12 Jan 2008 17:28:37 +0000 (+0000)
Subject: FilePath fixes
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=84c481d9e65f0a8285fddd6100a20b2cc0826b08

FilePath fixes
---

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index ef2c239..59fb3af 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -58,7 +58,6 @@ import Data.List	( isSuffixOf )
 import Data.Maybe
 import System.Exit
 import System.Environment
-import System.FilePath
 
 -- ---------------------------------------------------------------------------
 -- Pre-process
diff --git a/compiler/main/Finder.lhs b/compiler/main/Finder.lhs
index 61bf196..0e36b10 100644
--- a/compiler/main/Finder.lhs
+++ b/compiler/main/Finder.lhs
@@ -481,9 +481,9 @@ mkStubPaths dflags mod location
   = let
         stubdir = stubDir dflags
 
-		mod_basename = dots_to_slashes (moduleNameString mod)
-		src_basename = basenameOf (expectJust "mkStubPaths" 
-						(ml_hs_file location))
+        mod_basename = dots_to_slashes (moduleNameString mod)
+        src_basename = dropExtension $ expectJust "mkStubPaths" 
+                                                  (ml_hs_file location)
 
         stub_basename0
             | Just dir <- stubdir = dir </> mod_basename