[lmi-commits] [lmi] master 1f4ed3c: Specify a better location for config.guess

[Greg Chicares]

branch: master
commit 1f4ed3ccf5431d05ac435af4cf5560a9c9904e74
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Specify a better location for config.guess
---
 check_git_setup.sh        | 2 +-
 check_script.sh           | 2 +-
 configuration.make        | 2 +-
 gwc/.zshrc                | 2 +-
 gwc/rh.sh                 | 2 +-
 install_msw.sh            | 2 +-
 install_wx.sh             | 2 +-
 install_wxpdfdoc.sh       | 4 ++--
 install_xml_libraries.sh  | 2 +-
 set_toolchain.sh          | 2 +-
 tools/pete-2.1.1/Makefile | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/check_git_setup.sh b/check_git_setup.sh
index f8d3873..13c739f 100755
--- a/check_git_setup.sh
+++ b/check_git_setup.sh
@@ -35,7 +35,7 @@ printf '"%s" is git toplevel directory\n' "$toplevel"
 # 'core.filemode' is "false". See:
 #   https://lists.nongnu.org/archive/html/lmi/2017-11/msg00018.html
 
-lmi_build_type=$(/usr/share/libtool/build-aux/config.guess)
+lmi_build_type=$(/usr/share/misc/config.guess)
 case "$lmi_build_type" in
   (*-*-cygwin*)
     printf 'cygwin detected\n'
diff --git a/check_script.sh b/check_script.sh
index ee2797b..72ec429 100755
--- a/check_script.sh
+++ b/check_script.sh
@@ -23,7 +23,7 @@
 
 # Do nothing for cygwin, which has no 'shellcheck' package.
 
-lmi_build_type=$(/usr/share/libtool/build-aux/config.guess)
+lmi_build_type=$(/usr/share/misc/config.guess)
 case "$lmi_build_type" in
   (*-*-cygwin*) exit 0 ;;
 esac
diff --git a/configuration.make b/configuration.make
index dd76c29..b4f92d1 100644
--- a/configuration.make
+++ b/configuration.make
@@ -23,7 +23,7 @@
 
 # Include platform-specific makefile.
 
-lmi_build_type := $(shell /usr/share/libtool/build-aux/config.guess)
+lmi_build_type := $(shell /usr/share/misc/config.guess)
 
 ifeq (msys,$(findstring msys,$(lmi_build_type)))
   platform_makefile := msw_msys.make
diff --git a/gwc/.zshrc b/gwc/.zshrc
index 5dcfbad..ba919aa 100644
--- a/gwc/.zshrc
+++ b/gwc/.zshrc
@@ -3,7 +3,7 @@
 # To work with lmi, it is crucial to source 'set_toolchain.sh'. It's
 # deliberately not sourced here, so that it can assume that some
 # things have already been set up: for instance, it assumes that
-#   /usr/share/libtool/build-aux/config.guess
+#   /usr/share/misc/config.guess
 # is present, which need not be the case in a brand-new chroot.
 
 # Minimal system path.
diff --git a/gwc/rh.sh b/gwc/rh.sh
index 41e6075..e2a6825 100644
--- a/gwc/rh.sh
+++ b/gwc/rh.sh
@@ -73,7 +73,7 @@ patch --dry-run --strip=0 </home/${USER}/ltmain.sh.patch \
 # See:
 #   https://lists.nongnu.org/archive/html/lmi/2019-09/msg00035.html
 
-sudo cp -a /usr/share/libtool/config/config.guess 
/usr/share/libtool/build-aux/config.guess
+sudo cp -a /usr/share/libtool/config/config.guess /usr/share/misc/config.guess
 
 # Configure zsh, for root as well as the user configured above.
 
diff --git a/install_msw.sh b/install_msw.sh
index dcc11ef..c7e9059 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -34,7 +34,7 @@ set -vx
 stamp0=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
 echo "Started: $stamp0"
 
-lmi_build_type=$(/usr/share/libtool/build-aux/config.guess)
+lmi_build_type=$(/usr/share/misc/config.guess)
 
 # This should work with a rather minimal path.
 
diff --git a/install_wx.sh b/install_wx.sh
index 27d17a2..b7f3cfa 100755
--- a/install_wx.sh
+++ b/install_wx.sh
@@ -44,7 +44,7 @@ exec_prefix="$prefix/${LMI_COMPILER}_${LMI_TRIPLET}"
 srcdir=$(dirname "$(readlink --canonicalize "$0")")
 wx_dir="$srcdir/third_party/wx"
 
-build_type=$(/usr/share/libtool/build-aux/config.guess)
+build_type=$(/usr/share/misc/config.guess)
 
 # Script commands 
##############################################################
 
diff --git a/install_wxpdfdoc.sh b/install_wxpdfdoc.sh
index 694ec22..53e062a 100755
--- a/install_wxpdfdoc.sh
+++ b/install_wxpdfdoc.sh
@@ -44,7 +44,7 @@ exec_prefix="$prefix/${LMI_COMPILER}_${LMI_TRIPLET}"
 srcdir=$(dirname "$(readlink --canonicalize "$0")")
 wxpdfdoc_dir="$srcdir/third_party/wxpdfdoc"
 
-build_type=$(/usr/share/libtool/build-aux/config.guess)
+build_type=$(/usr/share/misc/config.guess)
 
 # Script commands 
##############################################################
 
@@ -67,7 +67,7 @@ config_options="
 
 # Provide the host and the build type only when cross-compiling,
 # because specifying host for native builds, e.g.:
-#   wx-config --host=$(/usr/share/libtool/build-aux/config.guess)
+#   wx-config --host=$(/usr/share/misc/config.guess)
 # fails. See:
 #   https://lists.nongnu.org/archive/html/lmi/2020-10/msg00039.html
 #   https://trac.wxwidgets.org/ticket/12698
diff --git a/install_xml_libraries.sh b/install_xml_libraries.sh
index 94306eb..b23938b 100755
--- a/install_xml_libraries.sh
+++ b/install_xml_libraries.sh
@@ -45,7 +45,7 @@ srcdir=$(dirname "$(readlink --canonicalize "$0")")
 
 build_dir="${exec_prefix}/xml-ad_hoc"
 
-build_type=$(/usr/share/libtool/build-aux/config.guess)
+build_type=$(/usr/share/misc/config.guess)
 
 case "$build_type" in
     (*-*-cygwin*)
diff --git a/set_toolchain.sh b/set_toolchain.sh
index 25e9170..66308c8 100755
--- a/set_toolchain.sh
+++ b/set_toolchain.sh
@@ -86,7 +86,7 @@
 foo()
 {
 local   lmi_build_type
-        lmi_build_type=$(/usr/share/libtool/build-aux/config.guess)
+        lmi_build_type=$(/usr/share/misc/config.guess)
 
 local      prefix="/opt/lmi"
 local localbindir="$prefix/local/${LMI_COMPILER}_${LMI_TRIPLET}/bin"
diff --git a/tools/pete-2.1.1/Makefile b/tools/pete-2.1.1/Makefile
index 9037e14..b8dfaa4 100644
--- a/tools/pete-2.1.1/Makefile
+++ b/tools/pete-2.1.1/Makefile
@@ -21,7 +21,7 @@
 
 
################################################################################
 
-lmi_build_type := $(shell /usr/share/libtool/build-aux/config.guess)
+lmi_build_type := $(shell /usr/share/misc/config.guess)
 
 EXEEXT :=
 ifeq (cygwin,$(findstring cygwin,$(lmi_build_type)))