diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-10-15 18:38:32 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-10-15 18:38:32 (GMT) |
| commit | c1bdc631fe9cbf391d13b23956e038bef596cbbf (patch) | |
| tree | e3487a278609005db397864c3267df8c395d36ba /win/configure.in | |
| parent | 1b633c1a2c27d0385c2c8ceaa76592f1257ab869 (diff) | |
| download | tk-c1bdc631fe9cbf391d13b23956e038bef596cbbf.zip tk-c1bdc631fe9cbf391d13b23956e038bef596cbbf.tar.gz tk-c1bdc631fe9cbf391d13b23956e038bef596cbbf.tar.bz2 | |
merge updates from HEAD
Diffstat (limited to 'win/configure.in')
| -rw-r--r-- | win/configure.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/win/configure.in b/win/configure.in index a57f066..5d8e922 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.66.2.2 2007/10/02 20:43:55 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.66.2.3 2007/10/15 18:38:41 dgp 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) |