From 5aa57d0137e7626a2ed2b3656d24d7a1aac74e58 Mon Sep 17 00:00:00 2001 From: Herbert Valerio Riedel Date: Thu, 26 Mar 2015 22:39:52 +0100 Subject: Fix Git-commit-id detection for RELEASE=YES By mistake, the Git-commit-id detection was only enabled for `RELEASE=NO` (since the date-based GHC version computation is only active in that case). With this commit the commit-id detection is active regardless of the `RELEASE`-setting. This is a follow-up to 73e5e2f8bade2d8b2b1ecae958fe12d0b24591ef --- aclocal.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aclocal.m4 b/aclocal.m4 index 5726a3feec..f5456ae717 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1586,6 +1586,7 @@ if test "$RELEASE" = "NO"; then dnl less likely to go wrong. PACKAGE_VERSION=${PACKAGE_VERSION}.`date +%Y%m%d` fi +fi AC_MSG_CHECKING([for GHC Git commit id]) if test -d .git; then @@ -1603,7 +1604,6 @@ if test "$RELEASE" = "NO"; then PACKAGE_GIT_COMMIT_ID="0000000000000000000000000000000000000000" fi -fi # Some renamings AC_SUBST([ProjectName], [$PACKAGE_NAME]) -- cgit v1.2.1