[lmi-commits] [lmi] odd/multiarch b2c1994 2/2: Source 'set_arch.sh' in install-everything script

[Greg Chicares]

branch: odd/multiarch
commit b2c1994129ba580a45549eb993c31e6f6ef6b496
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Source 'set_arch.sh' in install-everything script
---
 install_msw.sh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/install_msw.sh b/install_msw.sh
index 7d148c8..513092f 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -23,6 +23,8 @@
 
 set -vx
 
+export PATH="/usr/bin:/bin:/usr/sbin:/sbin"
+
 # To get the latest version of this script:
 #
 # wget -N 'https://git.savannah.gnu.org/cgit/lmi.git/plain/install_msw.sh'
@@ -195,8 +197,9 @@ do
 
 # Symlinks make multi-arch work fairly simple. Commands like these can
 # be run manually (at the command line) to switch between architectures.
-ln --symbolic --force --no-dereference /opt/lmi/"$LMI_HOST"/local 
/opt/lmi/local
-ln --symbolic --force --no-dereference /opt/lmi/"$LMI_HOST"/bin /opt/lmi/bin
+# ...but try suppressing them...
+# ln --symbolic --force --no-dereference /opt/lmi/"$LMI_HOST"/local 
/opt/lmi/local
+# ln --symbolic --force --no-dereference /opt/lmi/"$LMI_HOST"/bin /opt/lmi/bin
 
 make $coefficiency --output-sync=recurse -f install_miscellanea.make clobber
 make $coefficiency --output-sync=recurse -f install_miscellanea.make
@@ -209,8 +212,8 @@ make $coefficiency --output-sync=recurse -f 
install_libxml2_libxslt.make
 
 find /cache_for_lmi/downloads -type f | xargs md5sum
 
-export         PATH=/opt/lmi/local/bin:/opt/lmi/local/lib:$PATH
-export 
minimal_path=/opt/lmi/local/bin:/opt/lmi/local/lib:/usr/bin:/bin:/usr/sbin:/sbin
+#export         PATH=/opt/lmi/local/bin:/opt/lmi/local/lib:$PATH
+#export 
minimal_path=/opt/lmi/local/bin:/opt/lmi/local/lib:/usr/bin:/bin:/usr/sbin:/sbin
 
 # USE SYMLINKS INSTEAD
 #exec_prefix=/opt/lmi/"$LMI_HOST"
@@ -234,6 +237,13 @@ export 
minimal_path=/opt/lmi/local/bin:/opt/lmi/local/lib:/usr/bin:/bin:/usr/sbi
 #   export WINEPATH="$w0;$w1:$w2"
 #fi
 
+echo "$PATH"
+. ./set_arch.sh
+echo "$PATH"
+
+whence wx-config
+# get rid of this 'minimal_path' variable:
+minimal_path="$PATH"
 make $coefficiency --output-sync=recurse PATH=$minimal_path wx_config_check
 make $coefficiency --output-sync=recurse PATH=$minimal_path show_flags
 make $coefficiency --output-sync=recurse PATH=$minimal_path clean