build: Install auxiliary programs in $(libexecdir), not $(libdir). Part 2.

* gettext-tools/src/user-email.sh.in: Use libexecdir instead of libdir.

diff --git a/gettext-tools/src/user-email.sh.in b/gettext-tools/src/user-email.sh.in
index 2ca4fcf606a74317004694061c3d4e18e8398af4..b1e04cf55183e49f051914fcf85f7a8ffda98ce4 100644 (file)
--- a/gettext-tools/src/user-email.sh.in
+++ b/gettext-tools/src/user-email.sh.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Prints the user's email address, with confirmation from the user.
 #
-# Copyright (C) 2001-2003, 2005, 2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003, 2005, 2013, 2023 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,18 +16,18 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-# Prerequisites for using @libdir@ and @localedir@.
+# Prerequisites for using @libexecdir@ and @localedir@.
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 datarootdir="@datarootdir@"
 datadir="@datadir@"
-# Set variables libdir, localedir.
-libdir="@libdir@"
+# Set variables libexecdir, localedir.
+libexecdir="@libexecdir@"
 localedir="@localedir@"
 
 # Support for relocatability.
 if test "@RELOCATABLE@" = yes; then
-  orig_installdir="$libdir"/gettext # see Makefile.am's install rule
+  orig_installdir="$libexecdir"/gettext # see Makefile.am's install rule
   # Determine curr_installdir without caring for symlinked callers.
   curr_installdir=`echo "$0" | sed -e 's,/[^/]*$,,'`
   curr_installdir=`cd "$curr_installdir" && pwd`
@@ -46,7 +46,7 @@ if test "@RELOCATABLE@" = yes; then
     curr_installdir=`echo "$curr_installdir" | sed -e 's,/[^/]*$,,'`
   done
   # Now relocate the directory variables that we use.
-  libdir=`echo "$libdir/" | sed -e "s%^${orig_installdir}/%${curr_installdir}/%" | sed -e 's,/$,,'`
+  libexecdir=`echo "$libexecdir/" | sed -e "s%^${orig_installdir}/%${curr_installdir}/%" | sed -e 's,/$,,'`
   localedir=`echo "$localedir/" | sed -e "s%^${orig_installdir}/%${curr_installdir}/%" | sed -e 's,/$,,'`
 fi
 
@@ -81,10 +81,10 @@ fi
 # hostname on some systems (SVR3.2, old Linux) returns a bogus exit status,
 # so uname gets run too, so we keep only the first line of output.
 #host=`(hostname || uname -n) 2>/dev/null | sed 1q`
-host=`"$libdir"/gettext/hostname --short 2>/dev/null | sed 1q`
+host=`"$libexecdir"/gettext/hostname --short 2>/dev/null | sed 1q`
 
 # Find the hostname.
-hostfqdn=`"$libdir"/gettext/hostname --fqdn 2>/dev/null | sed 1q`
+hostfqdn=`"$libexecdir"/gettext/hostname --fqdn 2>/dev/null | sed 1q`
 
 # Find a list of email addresses from various mailer configuration files.
 # All mailers use configuration files under $HOME. We handle them in a