[lmi-commits] [lmi] master 53e1802 4/8: Use a gainlier name for source directory

[Greg Chicares]

branch: master
commit 53e1802120a17c69a822907c9806d57c2d5774e7
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Use a gainlier name for source directory
---
 install_wx.make       |  5 ++++-
 install_wxpdfdoc.make | 10 +++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/install_wx.make b/install_wx.make
index bf2a920..e2fb311 100644
--- a/install_wx.make
+++ b/install_wx.make
@@ -75,7 +75,9 @@ ifneq ($(use_git), N)
   wx_commit_sha     := 41045df7ea5f93e4c07c1bd846d7127a372705bd
   wx_md5            := 89775012799fe5c9bd8ea61e5fa43da7
 
-  wx_version        := $(wx_commit_sha)
+# Use a string distinct from any official wxwidgets.org release name
+# and from any such string previously used in this makefile.
+  wx_version        := 3.1.0-p1
 
   wx_archive        := wxWidgets-$(wx_commit_sha).zip
 
@@ -211,6 +213,7 @@ WGETFLAGS :=
        cd $(cache_dir) && [ -e $@ ] || $(WGET) $(WGETFLAGS) $(address@hidden)
        cd $(cache_dir) && $(ECHO) "$(address@hidden) *$@" | $(MD5SUM) --check
        -$(UNZIP) $(UNZIPFLAGS) $(cache_dir)/$@ -d $(wx_dir)
+       mv $(wx_dir)/$(basename $@) $(source_dir)
 
 .PHONY: wx
 wx:
diff --git a/install_wxpdfdoc.make b/install_wxpdfdoc.make
index 904e9a0..6e04ae2 100644
--- a/install_wxpdfdoc.make
+++ b/install_wxpdfdoc.make
@@ -58,10 +58,13 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(uname)))
   host_type     := i686-w64-mingw32
 endif
 
-compiler       := gcc-$(shell $(mingw_bin_dir)$(host_type)-gcc -dumpversion)
+compiler         := gcc-$(shell $(mingw_bin_dir)$(host_type)-gcc -dumpversion)
 
-wx_cc_flags    := -fno-omit-frame-pointer
-wx_cxx_flags   := -fno-omit-frame-pointer -std=c++11
+wxpdfdoc_version := 0.9.4
+source_dir       := $(wxpdfdoc_dir)/wxPdfDoc-$(wxpdfdoc_version)
+
+wx_cc_flags      := -fno-omit-frame-pointer
+wx_cxx_flags     := -fno-omit-frame-pointer -std=c++11
 
 config_options = \
   --prefix=$(prefix) \
@@ -104,6 +107,7 @@ WGETFLAGS :=
        cd $(cache_dir) && [ -e $@ ] || $(WGET) $(WGETFLAGS) $(address@hidden)
        cd $(cache_dir) && $(ECHO) "$(address@hidden) *$@" | $(MD5SUM) --check
        -$(UNZIP) $(UNZIPFLAGS) $(cache_dir)/$@ -d $(wxpdfdoc_dir)
+       mv $(wxpdfdoc_dir)/$(basename $@) $(source_dir)
 
 .PHONY: wxpdfdoc
 wxpdfdoc: $(wxpdfdoc_archive)