[commit: ghc] ghc-7.10: Fix Git-commit-id detection for RELEASE=YES (346a1c1)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/346a1c13c37f8378d9395a4b03bc84e7819006d4/ghc

>---------------------------------------------------------------

commit 346a1c13c37f8378d9395a4b03bc84e7819006d4
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Mar 26 22:39:52 2015 +0100

    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
    
    (cherry picked from commit 5aa57d0137e7626a2ed2b3656d24d7a1aac74e58)


>---------------------------------------------------------------

346a1c13c37f8378d9395a4b03bc84e7819006d4
 aclocal.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 141a42d..f3f7406 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])