summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2015-03-26 22:39:52 +0100
committerHerbert Valerio Riedel <hvr@gnu.org>2015-03-26 22:39:52 +0100
commit5aa57d0137e7626a2ed2b3656d24d7a1aac74e58 (patch)
tree1209cdef96d5dad088665e49181332ab7f7f6a1a
parent9db005a444722e31aca1956b058e069bcf3cacbd (diff)
downloadhaskell-5aa57d0137e7626a2ed2b3656d24d7a1aac74e58.tar.gz
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
-rw-r--r--aclocal.m42
1 files changed, 1 insertions, 1 deletions
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])