From f81bbc4a684e5d914a723f0bdc2e215308627a1d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 May 2013 18:52:35 -0400 Subject: rename var --- Build/Configure.hs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Build') 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 -- cgit v1.2.3