diff options
| -rw-r--r-- | Build/Configure.hs | 6 | ||||
| -rwxr-xr-x | debian/rules | 2 |
2 files changed, 3 insertions, 5 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 diff --git a/debian/rules b/debian/rules index da5596871..3a0511fa6 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ export CABAL=./Setup # Do use the changelog's version number, rather than making one up. -export VERSION_FROM_CHANGELOG=1 +export RELEASE_BUILD=1 %: dh $@ |