diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-01-06 13:16:09 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-01-06 13:16:09 (GMT) |
| commit | a4a0d409b2928736c386b4bfc4d8bc2965881ef1 (patch) | |
| tree | 5b01a65583cb82b144d789678c75aac8efc8c2b2 | |
| parent | 9de2cf209ce01256864592c053746ab6f826efb3 (diff) | |
| download | tcl-a4a0d409b2928736c386b4bfc4d8bc2965881ef1.zip tcl-a4a0d409b2928736c386b4bfc4d8bc2965881ef1.tar.gz tcl-a4a0d409b2928736c386b4bfc4d8bc2965881ef1.tar.bz2 | |
Fix determination of TCL_WIN_VERSION for manifest: Didn't take the semantic version into account yet.
| -rwxr-xr-x | win/configure | 6 | ||||
| -rw-r--r-- | win/configure.in | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/win/configure b/win/configure index 54eace3..26d677b 100755 --- a/win/configure +++ b/win/configure @@ -5197,11 +5197,11 @@ fi # TCL_WIN_VERSION is the 4 dotted pair Windows version format which needs # the release level, and must account for interim release versioning case "$TCL_PATCH_LEVEL" in - *a*) TCL_RELEASE_LEVEL=0 ;; - *b*) TCL_RELEASE_LEVEL=1 ;; + *alpha*) TCL_RELEASE_LEVEL=0 ;; + *beta*) TCL_RELEASE_LEVEL=1 ;; *) TCL_RELEASE_LEVEL=2 ;; esac -TCL_WIN_VERSION="$TCL_VERSION.$TCL_RELEASE_LEVEL.`echo $TCL_PATCH_LEVEL | tr -d ab.`" +TCL_WIN_VERSION="$TCL_VERSION.$TCL_RELEASE_LEVEL.`echo $TCL_PATCH_LEVEL | tr -d 0abehlpt\\\\-.`" # X86|AMD64|IA64 for manifest diff --git a/win/configure.in b/win/configure.in index 5fc78de..f635ac9 100644 --- a/win/configure.in +++ b/win/configure.in @@ -354,11 +354,11 @@ fi # TCL_WIN_VERSION is the 4 dotted pair Windows version format which needs # the release level, and must account for interim release versioning case "$TCL_PATCH_LEVEL" in - *a*) TCL_RELEASE_LEVEL=0 ;; - *b*) TCL_RELEASE_LEVEL=1 ;; + *alpha*) TCL_RELEASE_LEVEL=0 ;; + *beta*) TCL_RELEASE_LEVEL=1 ;; *) TCL_RELEASE_LEVEL=2 ;; esac -TCL_WIN_VERSION="$TCL_VERSION.$TCL_RELEASE_LEVEL.`echo $TCL_PATCH_LEVEL | tr -d ab.`" +TCL_WIN_VERSION="$TCL_VERSION.$TCL_RELEASE_LEVEL.`echo $TCL_PATCH_LEVEL | tr -d 0abehlpt\\\\-.`" AC_SUBST(TCL_WIN_VERSION) # X86|AMD64|IA64 for manifest AC_SUBST(MACHINE) |