summaryrefslogtreecommitdiff
path: root/Build/Configure.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-10 18:52:35 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-10 18:52:35 -0400
commitf81bbc4a684e5d914a723f0bdc2e215308627a1d (patch)
tree88d8fadf5baaf5f302aa3fa95ab45e03100145dd /Build/Configure.hs
parent0986ef0f888fb73dabe5f069e67e41a0b5fa090f (diff)
rename var
Diffstat (limited to 'Build/Configure.hs')
-rw-r--r--Build/Configure.hs6
1 files changed, 2 insertions, 4 deletions
diff --git a/Build/Configure.hs b/Build/Configure.hs
index a448c5f02..b269bc460 100644
--- a/Build/Configure.hs
+++ b/Build/Configure.hs
@@ -82,17 +82,15 @@ testCp k option = TestCase cmd $ testCmd k cmdline
cmd = "cp " ++ option
cmdline = cmd ++ " " ++ testFile ++ " " ++ testFile ++ ".new"
-{- For release builds, VERSION_FROM_CHANGELOG makes it use just the most
- - recent version from the changelog. -}
isReleaseBuild :: IO Bool
-isReleaseBuild = isJust <$> catchMaybeIO (getEnv "VERSION_FROM_CHANGELOG")
+isReleaseBuild = isJust <$> catchMaybeIO (getEnv "RELEASE_BUILD")
{- Version is usually based on the major version from the changelog,
- plus the date of the last commit, plus the git rev of that commit.
- This works for autobuilds, ad-hoc builds, etc.
-
- If git or a git repo is not available, or something goes wrong,
- - just use the version from the changelog. -}
+ - or this is a release build, just use the version from the changelog. -}
getVersion :: Test
getVersion = do
changelogversion <- getChangelogVersion