[lmi-commits] [lmi] odd/multiarch 62e0e85 7/7: Remove unnecessary host specifications

[Greg Chicares]

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

    Remove unnecessary host specifications
---
 INSTALL               | 2 +-
 README.schroot        | 5 ++---
 debian/menu           | 2 +-
 gwc/develop1.txt      | 6 +++---
 gwc/develop2.txt      | 8 ++++----
 install_msw.sh        | 2 +-
 tabs/5/startup_script | 4 ++--
 7 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/INSTALL b/INSTALL
index 1c40f78..39b8db9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -80,7 +80,7 @@ of hours, depending on your computer. When you see "Finished 
building lmi",
 copy and paste these lines into the shell:
 
   export LMI_HOST=i686-w64-mingw32 ; . ./set_arch.sh
-  /opt/lmi/x86_64-w64-mingw32/bin/lmi_wx_shared --data_path=/opt/lmi/data
+  /opt/lmi/bin/lmi_wx_shared --data_path=/opt/lmi/data
 
 You should see lmi's GUI. Try "File | New | Illustration", then press "OK";
 you should see values. Then try "File | Print preview"; you should see an
diff --git a/README.schroot b/README.schroot
index bc5a8df..3211add 100644
--- a/README.schroot
+++ b/README.schroot
@@ -330,7 +330,7 @@ chmod +x install_msw.sh
 # msw program, prefix its command line with 'wine'. Test the chroot by
 # running the lmi binary built in the preceding step:
 
-pushd /opt/lmi/x86_64-w64-mingw32/bin
+pushd /opt/lmi/bin
 wine ./lmi_wx_shared.exe --ash_nazg --data_path=../data
 
 # Symlink the repository's hooks/ directory:
@@ -371,8 +371,7 @@ rm /opt/lmi/src/build/lmi/Linux/gcc/ship/my*
 # the first time, because there are no old files to remove):
 cd /opt/lmi/data
 rm proprietary.dat proprietary.ndx
-wine /opt/lmi/x86_64-w64-mingw32/bin/rate_table_tool --accept \
- --file=proprietary --merge=/opt/lmi/proprietary/tables
+wine /opt/lmi/bin/rate_table_tool --accept --file=proprietary 
--merge=/opt/lmi/proprietary/tables
 
 # Run a system test.
 cd /opt/lmi/src/lmi
diff --git a/debian/menu b/debian/menu
index 4aaf3a7..79b9976 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,2 @@
 ?package(lmi):needs="X11" section="Apps/Technical"\
-  title="lmi" command="/opt/lmi/x86_64-w64-mingw32/bin/lmi_wx"
+  title="lmi" command="/opt/lmi/bin/lmi_wx"
diff --git a/gwc/develop1.txt b/gwc/develop1.txt
index e62d7a2..b1d1b25 100644
--- a/gwc/develop1.txt
+++ b/gwc/develop1.txt
@@ -214,7 +214,7 @@ date -u +'%Y%m%dT%H%MZ' |tr -d '\n' >/dev/clipboard
 
   # Fifth screen: only for running lmi and its GUI tests
 
-cd /opt/lmi/"$LMI_HOST"/bin
+cd /opt/lmi/bin
 ./lmi_wx_shared --ash_nazg --data_path=/opt/lmi/data
 
   # Run GUI tests
@@ -231,8 +231,8 @@ cd /opt/lmi/"$LMI_HOST"/bin
 
   # Test all valid emission types
 
-/opt/lmi/"$LMI_HOST"/bin/lmi_cli_shared --file=/opt/lmi/src/lmi/sample.ill 
--accept --ash_nazg --data_path=/opt/lmi/data 
--emit=emit_test_data,emit_spreadsheet,emit_text_stream,emit_custom_0,emit_custom_1
  2>&1 |less -S
-/opt/lmi/"$LMI_HOST"/bin/lmi_cli_shared --file=/opt/lmi/src/lmi/sample.cns 
--accept --ash_nazg --data_path=/opt/lmi/data 
--emit=emit_test_data,emit_spreadsheet,emit_group_roster,emit_text_stream,emit_custom_0,emit_custom_1
  2>&1 |less -S
+/opt/lmi/bin/lmi_cli_shared --file=/opt/lmi/src/lmi/sample.ill --accept 
--ash_nazg --data_path=/opt/lmi/data 
--emit=emit_test_data,emit_spreadsheet,emit_text_stream,emit_custom_0,emit_custom_1
  2>&1 |less -S
+/opt/lmi/bin/lmi_cli_shared --file=/opt/lmi/src/lmi/sample.cns --accept 
--ash_nazg --data_path=/opt/lmi/data 
--emit=emit_test_data,emit_spreadsheet,emit_group_roster,emit_text_stream,emit_custom_0,emit_custom_1
  2>&1 |less -S
 popd
 
   # Miscellany (no particular screen)
diff --git a/gwc/develop2.txt b/gwc/develop2.txt
index c5bcee4..5d20d1a 100644
--- a/gwc/develop2.txt
+++ b/gwc/develop2.txt
@@ -55,11 +55,11 @@ git push
 cd /opt/lmi/data
 rm proprietary.dat proprietary.ndx
   # native:
-/opt/lmi/"$LMI_HOST"/bin/rate_table_tool --accept --file=proprietary 
--merge=/opt/lmi/proprietary/tables
-/opt/lmi/"$LMI_HOST"/bin/rate_table_tool --accept --file=proprietary --verify
+/opt/lmi/bin/rate_table_tool --accept --file=proprietary 
--merge=/opt/lmi/proprietary/tables
+/opt/lmi/bin/rate_table_tool --accept --file=proprietary --verify
   # msw cross build:
-wine /opt/lmi/"$LMI_HOST"/bin/rate_table_tool --accept --file=proprietary 
--merge=/opt/lmi/proprietary/tables
-wine /opt/lmi/"$LMI_HOST"/bin/rate_table_tool --accept --file=proprietary 
--verify
+wine /opt/lmi/bin/rate_table_tool --accept --file=proprietary 
--merge=/opt/lmi/proprietary/tables
+wine /opt/lmi/bin/rate_table_tool --accept --file=proprietary --verify
 
   # To recover from errors
 
diff --git a/install_msw.sh b/install_msw.sh
index 9ac78c7..b74a400 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -229,7 +229,7 @@ done
 # cd /opt/lmi/data
 # printf '2450449 2472011'             >expiry
 # printf '%s\n' "$(md5sum expiry)"     >validated.md5
-# [wine] /opt/lmi/"$LMI_HOST"/bin/generate_passkey >passkey
+# [wine] /opt/lmi/bin/generate_passkey >passkey
 printf '2450449 2472011'                            >/opt/lmi/data/expiry
 printf '5fc68a795c9c60da1b32be989efc299a  expiry\n' 
>/opt/lmi/data/validated.md5
 printf '391daa5cbc54e118c4737446bcb84eea'           >/opt/lmi/data/passkey
diff --git a/tabs/5/startup_script b/tabs/5/startup_script
index 18f0138..5100b2f 100755
--- a/tabs/5/startup_script
+++ b/tabs/5/startup_script
@@ -2,8 +2,8 @@
 
 a='schroot --chroot=cross-lmi'
 
-b='cd /opt/lmi/x86_64-w64-mingw32/bin'
-c='LMI_HOST=x86_64-w64-mingw32 ; . /opt/lmi/src/lmi/set_arch.sh'
+b='cd /opt/lmi/bin'
+c='LMI_HOST=i686-w64-mingw32 ; . /opt/lmi/src/lmi/set_arch.sh'
 d='wine ./lmi_wx_shared --ash_nazg --data_path=/opt/lmi/data'
 e='/opt/lmi/src/lmi/gui_test.sh'