[lmi-commits] [lmi] master 15b1a71 3/4: In wx dir name, no longer remove periods from compiler version

[Greg Chicares]

branch: master
commit 15b1a710ead8d0b59d314c3af541f0a2f53d77a8
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    In wx dir name, no longer remove periods from compiler version
    
    Applied this change to the obsolescent makefile as well, to make
    testing easier.
---
 install_wx.make | 2 +-
 install_wx.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/install_wx.make b/install_wx.make
index 7cc9947..b8c4edb 100644
--- a/install_wx.make
+++ b/install_wx.make
@@ -82,7 +82,7 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(uname)))
 endif
 
 compiler       := gcc-$(shell $(mingw_bin_dir)$(host_type)-gcc -dumpversion)
-vendor         := $(subst .,,$(compiler))-$(wx_md5)
+vendor         := $(compiler)-$(wx_md5)
 
 source_dir     := $(wx_dir)/wxWidgets-$(wx_version)
 build_dir      := $(source_dir)/$(vendor)
diff --git a/install_wx.sh b/install_wx.sh
index a044560..48614ab 100755
--- a/install_wx.sh
+++ b/install_wx.sh
@@ -81,7 +81,7 @@ esac
 
 # Construct a vendor string for this build using the compiler name and version
 # and the unique commit SHA-1.
-gcc_version=`${mingw_bin_dir}${host_type}-gcc -dumpversion|tr -d '.\r'`
+gcc_version=`${mingw_bin_dir}${host_type}-gcc -dumpversion|tr -d '\r'`
 vendor=gcc-$gcc_version-$wx_commit_sha
 
 build_dir=$wx_dir/lmi-gcc-$gcc_version