[lmi-commits] [lmi] odd/multiarch c853aaa 1/5: Revert "Distinguish $exec_prefix from $prefix"

[Greg Chicares]

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

    Revert "Distinguish $exec_prefix from $prefix"
    
    This reverts commit cd1b383b6eb30f96476bd2c5ec50d39edf506a18.
---
 GNUmakefile                  | 8 +++-----
 install_libxml2_libxslt.make | 8 ++++----
 install_msw.sh               | 2 +-
 install_wx.sh                | 6 +++---
 install_wxpdfdoc.sh          | 6 +++---
 set_arch.sh                  | 4 ++--
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index bb6732b..81062bc 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -118,9 +118,9 @@ srcdir          := $(CURDIR)
 
 # These directories are outside the scope of the GNU Coding Standards.
 # Therefore, their names may contain '_' for distinction and clarity.
-localbindir     := $(prefix)/local/$(LMI_HOST)/bin
-locallibdir     := $(prefix)/local/$(LMI_HOST)/lib
-localincludedir := $(prefix)/local/include
+localbindir     := $(exec_prefix)/local/bin
+locallibdir     := $(exec_prefix)/local/lib
+localincludedir := $(exec_prefix)/local/include
 # Presuppose that system-test results may legitimately vary by
 # architecture. If experience shows otherwise, then these should
 # become subdirectories of $(prefix) instead.
@@ -380,8 +380,6 @@ raze: clobber
        -$(RM) --force --recursive $(prefix)/i686-w64-mingw32
        -$(RM) --force --recursive $(prefix)/x86_64-w64-mingw32
        -$(RM) --force --recursive $(prefix)/x86_64-pc-linux-gnu
-       -$(RM) --force --recursive $(prefix)/local
-       -$(RM) --force --recursive $(prefix)/third_party
 
 
################################################################################
 
diff --git a/install_libxml2_libxslt.make b/install_libxml2_libxslt.make
index 8d0d764..0e95efb 100644
--- a/install_libxml2_libxslt.make
+++ b/install_libxml2_libxslt.make
@@ -50,12 +50,12 @@ mingw_dir     := /MinGW_
 
 host_type     := $(if $(LMI_HOST),$(LMI_HOST),i686-w64-mingw32)
 
-prefix        := /opt/lmi/local
-exec_prefix   := $(prefix)/$(host_type)
+prefix        := /opt/lmi/$(host_type)/local
+exec_prefix   := $(prefix)
 
 cache_dir     := /cache_for_lmi/downloads
 
-build_dir     := $(prefix)/ad_hoc/xml-ad_hoc
+build_dir     := $(prefix)/../xml-ad_hoc
 
 # Variables that normally should be left alone 
#################################
 
@@ -129,7 +129,7 @@ $(libxml2_version)_options := \
   --build=`$(build_dir)/$(libxml2_version)/config.guess` \
   --host=$(host_type) \
   $(xmlsoft_common_options) \
-  --with-lzma=$(exec_prefix) \
+  --with-lzma=$(prefix) \
   --with-schemas \
   --without-iconv \
   --without-modules \
diff --git a/install_msw.sh b/install_msw.sh
index cdfb66d..f5ded01 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -226,7 +226,7 @@ make $coefficiency --output-sync=recurse -f 
install_libxml2_libxslt.make
 
 if [ "Cygwin" != "$platform" ]
 then
-    cp --archive /opt/lmi/third_party/bin/md5sum.exe 
/opt/lmi/local/"$LMI_HOST"/bin
+    cp --archive /opt/lmi/third_party/bin/md5sum.exe 
/opt/lmi/"$LMI_HOST"/local/bin
 fi
 
 find /cache_for_lmi/downloads -type f | xargs md5sum
diff --git a/install_wx.sh b/install_wx.sh
index 998d4ef..2c6ddef 100755
--- a/install_wx.sh
+++ b/install_wx.sh
@@ -47,8 +47,8 @@ host_type=${LMI_HOST:-"i686-w64-mingw32"}
 
 mingw_dir=/MinGW_
 
-prefix=/opt/lmi/local
-exec_prefix="$prefix"/"$host_type"
+prefix=/opt/lmi/"$host_type"/local
+exec_prefix="$prefix"
 
 repo_name="wxWidgets"
 
@@ -134,7 +134,7 @@ config_options="
 
 [ -n "$mingw_bin_dir" ] && export PATH="$mingw_bin_dir:${PATH}"
 
-build_dir="$prefix"/ad_hoc/wx-ad_hoc/lmi-gcc-$gcc_version
+build_dir="$prefix"/../wx-ad_hoc/lmi-gcc-$gcc_version
 
 if [ "$wx_skip_clean" != 1 ]
 then
diff --git a/install_wxpdfdoc.sh b/install_wxpdfdoc.sh
index 62f6afb..f267ca9 100755
--- a/install_wxpdfdoc.sh
+++ b/install_wxpdfdoc.sh
@@ -47,8 +47,8 @@ host_type=${LMI_HOST:-"i686-w64-mingw32"}
 
 mingw_dir=/MinGW_
 
-prefix=/opt/lmi/local
-exec_prefix="$prefix"/"$host_type"
+prefix=/opt/lmi/"$host_type"/local
+exec_prefix="$prefix"
 
 repo_name="wxpdfdoc"
 
@@ -104,7 +104,7 @@ config_options="
 cd "$proxy_wxpdfdoc_dir"
 autoreconf --verbose
 
-build_dir="$prefix"/ad_hoc/wxpdfdoc-ad_hoc/wxpdfdoc-$wxpdfdoc_commit_sha
+build_dir="$prefix"/../wxpdfdoc-ad_hoc/wxpdfdoc-$wxpdfdoc_commit_sha
 
 if [ "$wxpdfdoc_skip_clean" != 1 ]
 then
diff --git a/set_arch.sh b/set_arch.sh
index 68277d5..1a8b9ec 100755
--- a/set_arch.sh
+++ b/set_arch.sh
@@ -49,8 +49,8 @@ local   lmi_build_type
 
 local      prefix="/opt/lmi"
 local exec_prefix="$prefix"/"$LMI_HOST"
-local localbindir="$prefix"/local/"$LMI_HOST"/bin
-local locallibdir="$prefix"/local/"$LMI_HOST"/lib
+local localbindir="$exec_prefix"/local/bin
+local locallibdir="$exec_prefix"/local/lib
 local extrabindir=/opt/lmi/third_party/bin
 
 # Running a command like this many times: