X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6106441685a38400d9aa94ccb7218218102f941c..08baa09f9fd9cd29ca89f3f90264678eef9bda10:/test/common.sh.in

diff --git a/test/common.sh.in b/test/common.sh.in
index 4c7089c4..d5a9d7e1 100644
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -64,6 +64,7 @@ setup_test ()
   export MH_INST_DIR=${MH_TEST_DIR}/inst
   export MHMTSCONF=${MH_INST_DIR}${sysconfdir}/mts.conf
   export PATH=${MH_INST_DIR}${bindir}:${PATH}
+  export MH_LIB_DIR=${MH_INST_DIR}${auxexecdir}
 
   if [ -z "${srcdir}" ]; then
     echo "srcdir not set; aborting"
@@ -84,21 +85,16 @@ setup_test ()
   mkdir $MH_TEST_DIR/Mail || exit 1
   cat > $MH <<EOF || exit 1
 Path: ${MH_TEST_DIR}/Mail
-mhlproc: ${MH_OBJ_DIR}/uip/mhl
+mhlproc: ${MH_LIB_DIR}/mhl
 EOF
 
   for f in MailAliases components digestcomps distcomps forwcomps mhl.body \
   	   mhl.digest mhl.format mhl.forward mhl.headers mhl.reply \
-	   rcvdistcomps replcomps replgroupcomps scan.MMDDYY \
+	   mhn.defaults rcvdistcomps replcomps replgroupcomps scan.MMDDYY \
 	   scan.YYYYMMDD scan.default scan.mailx scan.nomime scan.size \
 	   scan.time scan.timely scan.unseen
   do
-    cp ${srcdir}/etc/${f} ${MH_TEST_DIR}/Mail || exit 1
-  done
-
-  for f in mhn.defaults mts.conf
-  do
-    cp ${MH_OBJ_DIR}/etc/${f} ${MH_TEST_DIR}/Mail || exit 1
+    cp ${MH_INST_DIR}${sysconfdir}/${f} ${MH_TEST_DIR}/Mail || exit 1
   done
 
   folder -create +inbox > /dev/null