diff options
| -rwxr-xr-x | bootstrap | 5 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 2 insertions, 10 deletions
@@ -37,6 +37,7 @@ export AUTOM4TE # ditto # Variables to substitute. VERSION=`sed -ne '/AC_INIT/s/^[^[]*\[[^[]*\[\([^]]*\)\].*$/\1/p' configure.ac` +APIVERSION=`sed -n 's/^APIVERSION=//p' configure.ac` PACKAGE=automake datadir=. # This should be automatically updated by the 'update-copyright' @@ -52,10 +53,6 @@ else BOOTSTRAP_SHELL=/bin/sh fi -# Read the rule for calculating APIVERSION and execute it. -apiver_cmd=`sed -ne 's/\[\[/[/g;s/\]\]/]/g;/^APIVERSION=/p' configure.ac` -eval "$apiver_cmd" - # Sanity checks. if test -z "$VERSION"; then echo "$me: cannot find VERSION" >&2 diff --git a/configure.ac b/configure.ac index 7f91f9609..806dcce43 100644 --- a/configure.ac +++ b/configure.ac @@ -49,12 +49,7 @@ AC_SUBST([RELEASE_YEAR]) # The API version is the base version. We must guarantee # compatibility for all releases with the same API version. -# Our current rule is that: -# * All releases, including the prereleases, in an X.Y series -# are compatible. So 1.5.1c is compatible with 1.5. -# * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c -# aren't the same. -APIVERSION=`echo "$VERSION" | sed -e 's/^\([[0-9]]*\.[[0-9]]*[[a-z]]*\).*$/\1/'` +APIVERSION=1.15a AC_SUBST([APIVERSION]) AC_SUBST([pkgvdatadir], ["\${datadir}/$PACKAGE-$APIVERSION"]) |