From 1adb71ff686307de95d4745a7e928494da6653d3 Mon Sep 17 00:00:00 2001
From: David Levine <levinedl@acm.org>
Date: Sun, 17 Jun 2012 20:59:16 -0500
Subject: [PATCH] Here's a better fix that
 e194fdf11df779597e19039a67454e9b42a77ef0 for support
 `mhparam libdir` under "make distcheck":  explicitly set
 libdir in the profile.

---
 test/common.sh.in         |    3 ++-
 test/mhparam/test-mhparam |    2 +-
 uip/mhmail                |    2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/common.sh.in b/test/common.sh.in
index 54f3b8e..e5da52c 100644
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -135,7 +135,7 @@ setup_test ()
 {
   MH=${MH_TEST_DIR}/Mail/.mh_profile
   MHMTSCONF=${MH_INST_DIR}${sysconfdir}/mts.conf
-  PATH=${MH_INST_DIR}${bindir}:${MH_INST_DIR}${auxexecdir}:${PATH}
+  PATH=${MH_INST_DIR}${bindir}:${PATH}
   MH_LIB_DIR=${MH_INST_DIR}${auxexecdir}
   export MH MHMTSCONF MH_LIB_DIR PATH
 
@@ -161,6 +161,7 @@ setup_test ()
   mkdir $MH_TEST_DIR/Mail || exit 1
   cat > $MH <<EOF || exit 1
 Path: ${MH_TEST_DIR}/Mail
+libdir: ${MH_LIB_DIR}
 mhlproc: ${MH_LIB_DIR}/mhl
 moreproc: cat
 showproc: ${MH_LIB_DIR}/mhl
diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index cc6089e..cde481c 100755
--- a/test/mhparam/test-mhparam
+++ b/test/mhparam/test-mhparam
@@ -100,7 +100,7 @@ $bindir/msh
 $bindir/whatnow
 $bindir/whom
 $sysconfdir
-$auxexecdir
+${MH_LIB_DIR}
 EOF
 
 mhparam -nocomponent \
diff --git a/uip/mhmail b/uip/mhmail
index 3727ce0..57d0f8a 100755
--- a/uip/mhmail
+++ b/uip/mhmail
@@ -113,8 +113,6 @@ else
   fi
   if [ "${from}"x = x ]; then
     nmhlibdir=`${nmhbindir}/mhparam libdir`/
-    #### If nmhlibdir isn't right, assume that the nmh lib dir is on the PATH.
-    [ -x "${nmhlibdir}ap" ]  ||  nmhlibdir=
     from=`${nmhlibdir}ap -format '%(localmbox)' 0`
   fi
 
-- 
1.7.10.4