From: simonmar <unknown>
Date: Mon, 27 Sep 2004 11:48:29 +0000 (+0000)
Subject: [project @ 2004-09-27 11:48:29 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~1577
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=9aa52fae0eaf3c94fe5d14af188df83660b65bc9;p=ghc-hetmet.git

[project @ 2004-09-27 11:48:29 by simonmar]
sed-magic for ProjectVersionInt: make it work for version numbers with
patchlevel components (ToDo: ProjectPatchLevel still isn't set
properly in version.mk, this has to be updated by hand).
---

diff --git a/ghc/configure.ac b/ghc/configure.ac
index 597b15c..2075912 100644
--- a/ghc/configure.ac
+++ b/ghc/configure.ac
@@ -1,11 +1,13 @@
 # Initialise and check sanity.
-AC_INIT([Glasgow Haskell Compiler], [6.3], [glasgow-haskell-bugs@haskell.org], [ghc])
+AC_INIT([Glasgow Haskell Compiler], [6.3.20040927], [glasgow-haskell-bugs@haskell.org], [ghc])
 AC_CONFIG_SRCDIR([ghc.spec.in])
 
 # Calculate project version as an integer, using 2 digits for minor version
 case $PACKAGE_VERSION in
   *.?)  ProjectVersionInt=`echo "$PACKAGE_VERSION" | sed 's,^\(.*\)\.\(.\)$,\10\2,'` ;;
   *.??) ProjectVersionInt=`echo "$PACKAGE_VERSION" | sed 's,^\(.*\)\.\(..\)$,\1\2,'` ;;
+  *.?.*)  ProjectVersionInt=`echo "$PACKAGE_VERSION" | sed 's,^\(.*\)\.\(.\)\.\(.*\)$,\10\2,'` ;;
+  *.??.*) ProjectVersionInt=`echo "$PACKAGE_VERSION" | sed 's,^\(.*\)\.\(..\)\.\(.*\)$,\1\2,'` ;;
   *) AC_MSG_ERROR([bad package version $PACKAGE_VERSION]) ;;
 esac
 AC_SUBST([ProjectVersionInt])