[lmi-commits] [lmi] master 65e02fd 2/8: Make wx build directory at a more appropriate time

[Greg Chicares]

branch: master
commit 65e02fddeb481066a310e01e3c31b05825cdc063
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Make wx build directory at a more appropriate time
    
    Extracting an archive creates a source directory, of which the build
    directory is a subdirectory. Previously, the build directory was
    created before extracting the archive, which was fragile at best. Now
    the build directory is created immediately before use.
    
    Incidentally, the source directory is explicitly specified, because
    that will become useful soon.
---
 install_wx.make | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/install_wx.make b/install_wx.make
index bc1c3e5..038c781 100644
--- a/install_wx.make
+++ b/install_wx.make
@@ -113,7 +113,8 @@ endif
 compiler       := gcc-$(shell $(mingw_bin_dir)$(host_type)-gcc -dumpversion)
 vendor         := $(subst .,,$(compiler))-$(wx_md5)
 
-build_dir      := $(wx_dir)/wxWidgets-$(wx_version)/$(vendor)
+source_dir     := $(wx_dir)/wxWidgets-$(wx_version)
+build_dir      := $(source_dir)/$(vendor)
 
 # Configuration reference:
 #   http://lists.nongnu.org/archive/html/lmi/2007-11/msg00001.html
@@ -168,6 +169,7 @@ patchset        := wx-$(wx_version).patch
 .PHONY: all
 all: clobber $(source_archives)
        -[ -e $(patchset) ] && $(PATCH) --directory=$(wx_dir) --strip=1 
<$(patchset)
+       $(MKDIR) --parents $(build_dir)
        $(MAKE) --file=$(this_makefile) --directory=$(build_dir) wx
        $(MAKE) --file=$(this_makefile) --directory=$(prefix)/bin 
portable_script
 
@@ -179,7 +181,7 @@ initial_setup: clobber
 initial_setup:
        $(MKDIR) --parents $(prefix)
        $(MKDIR) --parents $(cache_dir)
-       $(MKDIR) --parents $(build_dir)
+       $(MKDIR) --parents $(wx_dir)
 
 TARFLAGS := --keep-old-files
 %.tar.bz2: TARFLAGS += --bzip2