[lmi-commits] [lmi] master 599b43a 2/2: Find toolchain on PATH instead of specifying location of each tool

[Greg Chicares]

branch: master
commit 599b43aa67c3b03f78e6fc4ff8c2f61f26a2071a
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Find toolchain on PATH instead of specifying location of each tool
---
 install_wx.make       |   15 ++-------------
 install_wxpdfdoc.make |   19 ++++---------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/install_wx.make b/install_wx.make
index b878e38..4fa5b85 100644
--- a/install_wx.make
+++ b/install_wx.make
@@ -127,18 +127,6 @@ config_options = \
   --without-subdirs \
   CFLAGS='$(wx_cc_flags)' \
   CXXFLAGS='$(wx_cxx_flags)' \
-       AR='$(mingw_bin_dir)/$(triplet_prefix)ar' \
-       AS='$(mingw_bin_dir)/$(triplet_prefix)as' \
-       CC='$(mingw_bin_dir)/$(triplet_prefix)gcc' \
-      CPP='$(mingw_bin_dir)/$(triplet_prefix)cpp' \
-      CXX='$(mingw_bin_dir)/$(triplet_prefix)g++' \
-  DLLTOOL='$(mingw_bin_dir)/$(triplet_prefix)dlltool' \
-       LD='$(mingw_bin_dir)/$(triplet_prefix)ld' \
-       NM='$(mingw_bin_dir)/$(triplet_prefix)nm' \
-  OBJDUMP='$(mingw_bin_dir)/$(triplet_prefix)objdump' \
-   RANLIB='$(mingw_bin_dir)/$(triplet_prefix)ranlib' \
-    STRIP='$(mingw_bin_dir)/$(triplet_prefix)strip' \
-  WINDRES='$(mingw_bin_dir)/$(triplet_prefix)windres' \
 
 # Utilities 
####################################################################
 
@@ -202,7 +190,8 @@ WGETFLAGS :=
 
 .PHONY: wx
 wx:
-       ../configure $(config_options) && $(MAKE) && $(MAKE) install
+       export PATH="$(mingw_bin_dir):${PATH}" \
+         && ../configure $(config_options) && $(MAKE) && $(MAKE) install \
 
 # 'wx-config' is not portable. For example, it uses 'printf(1)', which
 # zsh supports only in versions after 4.0.1 . Far worse, it underlies
diff --git a/install_wxpdfdoc.make b/install_wxpdfdoc.make
index 086741d..a342fdb 100644
--- a/install_wxpdfdoc.make
+++ b/install_wxpdfdoc.make
@@ -65,18 +65,6 @@ config_options = \
   --with-wx-config=$(prefix)/bin/wx-config-portable \
   CFLAGS='$(wx_cc_flags)' \
   CXXFLAGS='$(wx_cxx_flags)' \
-       AR='$(mingw_bin_dir)/$(triplet_prefix)ar' \
-       AS='$(mingw_bin_dir)/$(triplet_prefix)as' \
-       CC='$(mingw_bin_dir)/$(triplet_prefix)gcc' \
-      CPP='$(mingw_bin_dir)/$(triplet_prefix)cpp' \
-      CXX='$(mingw_bin_dir)/$(triplet_prefix)g++' \
-  DLLTOOL='$(mingw_bin_dir)/$(triplet_prefix)dlltool' \
-       LD='$(mingw_bin_dir)/$(triplet_prefix)ld' \
-       NM='$(mingw_bin_dir)/$(triplet_prefix)nm' \
-  OBJDUMP='$(mingw_bin_dir)/$(triplet_prefix)objdump' \
-   RANLIB='$(mingw_bin_dir)/$(triplet_prefix)ranlib' \
-    STRIP='$(mingw_bin_dir)/$(triplet_prefix)strip' \
-  WINDRES='$(mingw_bin_dir)/$(triplet_prefix)windres' \
 
 # Utilities 
####################################################################
 
@@ -112,9 +100,10 @@ WGETFLAGS :=
 
 .PHONY: wxpdfdoc
 wxpdfdoc: $(wxpdfdoc_archive)
-       cd $(wxpdfdoc_dir)/$(wxpdfdoc_basename) && \
-           ./configure $(config_options) && \
-           $(MAKE) install_pdfdoc_dll install_pdfdoc_dll_headers
+       cd $(wxpdfdoc_dir)/$(wxpdfdoc_basename) \
+         && export PATH="$(mingw_bin_dir):${PATH}" \
+         && ./configure $(config_options) \
+         && $(MAKE) install_pdfdoc_dll install_pdfdoc_dll_headers \
 
 .PHONY: clobber
 clobber: