diff --git a/Options.hs b/Options.hs index 5cc988d1d..ece334795 100644 --- a/Options.hs +++ b/Options.hs @@ -7,6 +7,7 @@ module Options where import System.Console.GetOpt import System.Environment +import Version (timeprogname) import Ledger.IO (myLedgerPath,myTimelogPath) import Ledger.Utils import Ledger.Types @@ -16,8 +17,6 @@ import Codec.Binary.UTF8.String (decodeString) #endif import Control.Monad (liftM) -progname = "hledger" -timeprogname = "hours" #ifdef CHART chartoutput = "hledger.png" chartitems = 10 diff --git a/Version.hs b/Version.hs index 7956cb83f..cb88a13b6 100644 --- a/Version.hs +++ b/Version.hs @@ -8,7 +8,6 @@ module Version where import System.Info (os, arch) import Ledger.Utils -import Options (progname) -- version and PATCHLEVEL are set by the makefile version = "0.8.0" @@ -19,6 +18,9 @@ patchlevel = "." ++ show PATCHLEVEL -- must be numeric ! patchlevel = "" #endif +progname = "hledger" +timeprogname = "hours" + buildversion = version ++ patchlevel :: String binaryfilename = prettify $ splitAtElement '.' buildversion :: String