[project @ 2004-08-31 16:19:54 by panne]

Fixed version/release magic. Actually I think we're doing things the wrong way
here: We should use AC_INIT with a version parameter as the central place for
this info and substitute what's needed into the rest of the files.

diff --git a/ghc/configure.ac b/ghc/configure.ac
index 2d9e602..efbf7d0 100644 (file)
--- a/ghc/configure.ac
+++ b/ghc/configure.ac
@@ -1,15 +1,9 @@
 # Initialise and check sanity.
 AC_INIT([ghc.spec.in])
 
-# Compute the version number.
-version=`sed -e 's/.*\([[0-9]]\)\.\([[0-9]]*\).*/\1.\2/' VERSION`
-
-# ToDo: CVS snapshots should probably use the date here
-release=1
-
-# These are needed by the .spec file.
-AC_SUBST([version])
-AC_SUBST([release])
+# Compute the version number and the release, they are needed by the .spec file.
+AC_SUBST([version], [[`sed 's/.* version \([0-9][0-9.]*\).*/\1/' VERSION`]])
+AC_SUBST([release], [1])
 
 # Write the results...
 AC_OUTPUT([ghc.spec])