diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | win/configure | 6 | ||||
| -rw-r--r-- | win/configure.in | 8 |
3 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,8 @@ +2007-10-14 Jeff Hobbs <jeffh@ActiveState.com> + + * win/configure, win/configure.in (TK_WIN_VERSION): Make sure the + patchlevel doesn't contain extra dotted pairs (eg. interim release) + 2007-10-12 Pat Thoyts <patthoyts@users.sourceforge.net> * win/makefile.vc: Mine all version information from headers. diff --git a/win/configure b/win/configure index 8af0d01..f1f75d9 100755 --- a/win/configure +++ b/win/configure @@ -4069,9 +4069,11 @@ fi # The wish.exe.manifest requires these # TK_WIN_VERSION is the 4 dotted pair Windows version format +# Make sure the patch level doesn't contain extra dotted pairs (interim rel) +AB_PATCH_LEVEL="`echo $TK_PATCH_LEVEL | sed -e 's/\..*//'`" case "$TK_PATCH_LEVEL" in - a*) TK_WIN_VERSION="$TK_VERSION.0.`echo $TK_PATCH_LEVEL | tr -d a`" ;; - b*) TK_WIN_VERSION="$TK_VERSION.1.`echo $TK_PATCH_LEVEL | tr -d b`" ;; + a*) TK_WIN_VERSION="$TK_VERSION.0.`echo $AB_PATCH_LEVEL | tr -d a`" ;; + b*) TK_WIN_VERSION="$TK_VERSION.1.`echo $AB_PATCH_LEVEL | tr -d b`" ;; .*) TK_WIN_VERSION="$TK_VERSION.2$TK_PATCH_LEVEL" ;; esac diff --git a/win/configure.in b/win/configure.in index d42745a..f975acf 100644 --- a/win/configure.in +++ b/win/configure.in @@ -3,7 +3,7 @@ # generate the file "configure", which is run during Tk installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.68 2007/10/02 18:28:16 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.69 2007/10/15 01:05:28 hobbs Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.59) @@ -231,9 +231,11 @@ fi # The wish.exe.manifest requires these # TK_WIN_VERSION is the 4 dotted pair Windows version format +# Make sure the patch level doesn't contain extra dotted pairs (interim rel) +AB_PATCH_LEVEL="`echo $TK_PATCH_LEVEL | sed -e 's/\..*//'`" case "$TK_PATCH_LEVEL" in - a*) TK_WIN_VERSION="$TK_VERSION.0.`echo $TK_PATCH_LEVEL | tr -d a`" ;; - b*) TK_WIN_VERSION="$TK_VERSION.1.`echo $TK_PATCH_LEVEL | tr -d b`" ;; + a*) TK_WIN_VERSION="$TK_VERSION.0.`echo $AB_PATCH_LEVEL | tr -d a`" ;; + b*) TK_WIN_VERSION="$TK_VERSION.1.`echo $AB_PATCH_LEVEL | tr -d b`" ;; .*) TK_WIN_VERSION="$TK_VERSION.2$TK_PATCH_LEVEL" ;; esac AC_SUBST(TK_WIN_VERSION) |