Remove the dependency on Cabal
authorIan Lynagh <igloo@earth.li>
Thu, 24 Jul 2008 17:07:58 +0000 (17:07 +0000)
committerIan Lynagh <igloo@earth.li>
Thu, 24 Jul 2008 17:07:58 +0000 (17:07 +0000)
We now use Data.Version.showVersion rather than display

Main.hs
hsc2hs.cabal

diff --git a/Main.hs b/Main.hs
index 659b125..10add9c 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -37,7 +37,6 @@ import System.IO                ( openFile, IOMode(..), hClose )
 #endif
 
 import IO                ( bracket_ )
-import Distribution.Text
 
 #if ! BUILD_NHC
 import Paths_hsc2hs             ( getDataFileName, version )
@@ -140,7 +139,7 @@ main = do
                    -- Euch, this is horrible. Unfortunately
                    -- Paths_hsc2hs isn't too useful for a
                    -- relocatable binary, though.
-                     let templ1 = path ++ "/hsc2hs-" ++ display Paths_hsc2hs.version ++ "/template-hsc.h"
+                     let templ1 = path ++ "/hsc2hs-" ++ showVersion Paths_hsc2hs.version ++ "/template-hsc.h"
                      exists1 <- doesFileExist templ1
                      if exists1
                         then return (Just templ1)
index 8d06366..4d8e0a6 100644 (file)
@@ -37,5 +37,5 @@ Executable hsc2hs
                        process    >= 1   && < 1.1
     else
         Build-Depends: base < 3
-    Build-Depends: haskell98, Cabal
+    Build-Depends: haskell98