[lmi-commits] [lmi] master 6645aa7 21/22: Eradicate 'winebindir'

[Greg Chicares]

branch: master
commit 6645aa78d4189318802face6815c0ba909ac395c
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Eradicate 'winebindir'
    
    The only file in "$prefix"/third_party/bin/ is the custom-built md5sum
    program, but it's no longer needed for production because MD5 validation
    is now internal. (In case it's useful for developers, it will be copied
    to a different directory in a changeset to be committed soon.)
---
 GNUmakefile      | 3 ---
 set_toolchain.sh | 5 +----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 36c465e..f455bf9 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -152,7 +152,6 @@ endif
 localbindir     := $(prefix)/local/$(LMI_COMPILER)_$(LMI_TRIPLET)/bin
 locallibdir     := $(prefix)/local/$(LMI_COMPILER)_$(LMI_TRIPLET)/lib
 localincludedir := $(prefix)/local/include
-winebindir      := $(prefix)/third_party/bin
 test_dir        := $(prefix)/test
 touchstone_dir  := $(prefix)/touchstone
 
@@ -230,7 +229,6 @@ MAKETARGET = \
                      localbindir='$(localbindir)' \
                      locallibdir='$(locallibdir)' \
                  localincludedir='$(localincludedir)' \
-                      winebindir='$(winebindir)' \
                         test_dir='$(test_dir)' \
                   touchstone_dir='$(touchstone_dir)' \
                     LMI_COMPILER='$(LMI_COMPILER)' \
@@ -271,7 +269,6 @@ show_env:
        @printf 'localbindir     = "%s"\n' "$(localbindir)"
        @printf 'locallibdir     = "%s"\n' "$(locallibdir)"
        @printf 'localincludedir = "%s"\n' "$(localincludedir)"
-       @printf 'winebindir      = "%s"\n' "$(winebindir)"
 
 
################################################################################
 
diff --git a/set_toolchain.sh b/set_toolchain.sh
index 70ed5b8..f4a43c0 100755
--- a/set_toolchain.sh
+++ b/set_toolchain.sh
@@ -90,8 +90,6 @@ local   lmi_build_type
 local      prefix="/opt/lmi"
 local localbindir="$prefix/local/${LMI_COMPILER}_${LMI_TRIPLET}/bin"
 local locallibdir="$prefix/local/${LMI_COMPILER}_${LMI_TRIPLET}/lib"
-# $winebindir is where 'make install' places 'lmi_md5sum.exe'.
-local  winebindir="$prefix"/third_party/bin
 
 # Running a command like this many times:
 #   export PATH="$localbindir":"$locallibdir":"$PATH"
@@ -127,8 +125,7 @@ case "$lmi_build_type" in
     (*-*-linux*)
         w0="$(winepath -w "$localbindir" | sed -e's/\\/\\\\/g')"
         w1="$(winepath -w "$locallibdir" | sed -e's/\\/\\\\/g')"
-        w2="$(winepath -w "$winebindir"  | sed -e's/\\/\\\\/g')"
-        export WINEPATH="$w0;$w1;$w2"
+        export WINEPATH="$w0;$w1"
         export  PERFORM="wine"
         ;;
     (*) ;;