Reverted commit a2b00e7053ca3be3d1389588580c71498222a267. It caused

make check to pull etc files from where they were already installed,
not from the test directory.

diff --git a/Makefile.am b/Makefile.am
index af4a2fe..1cc0875 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,6 @@ TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_builddir@" \
                    MH_TEST_DIR="@abs_builddir@/test/testdir" \
                    nmhlibexecdir="$(nmhlibexecdir)" bindir="$(bindir)" \
                    mandir="$(mandir)" nmhetcdir="$(nmhetcdir)" \
-                   nmhetcdirinst="@nmhetcdirinst@$(nmhetcdir)" \
                    supported_locks="$(supported_locks)" \
                    default_locking="${default_locking}" \
                    MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \
@@ -103,13 +102,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 check_SCRIPTS = test/common.sh
 check_PROGRAMS = test/getfullname test/getcanon test/fakepop test/fakesmtp \
                 test/getcwidth
-
-## The location of installed nmhetcdir is, for all purposes except
-## distcheck, $nmhetcdir.  For distcheck, prepend $MH_INST_DIR (from
-## test/common.sh.in), which is based on $MH_TEST_DIR (from
-## $TESTS_ENVIRONMENT).
-DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1 \
-                           NMHETCDIRINST='$${abs_builddir}/test/testdir/inst'
+DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1
 
 ##
 ## Stuff that should be cleaned via "make clean"
@@ -603,7 +596,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \
 
 config/sbr_libmh_a-config.$(OBJEXT) sbr/sbr_libmh_a-mts.$(OBJEXT): Makefile
 
-sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"@nmhetcdirinst@$(nmhetcdir)"' \
+sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(nmhetcdir)"' \
                -DMAILSPOOL='"$(mailspool)"' \
                -DSENDMAILPATH='"$(sendmailpath)"' -DNMHBINDIR='"$(bindir)"' \
                -DNMHLIBEXECDIR='"$(nmhlibexecdir)"'

diff --git a/configure.ac b/configure.ac
index 02f0a04..e0a96f5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -515,13 +515,6 @@ AS_IF([test "$LEX" = flex],
 '; sed "s/\(   \)int i;/\1yy_size_t i;/" $@ >$@.tmp && mv -f $@.tmp $@'])
        AC_SUBST([LFLAGS])])
 
-dnl ------------------
-dnl FOR INTERNAL USE by the NMH test suite
-dnl ------------------
-AC_ARG_VAR([NMHETCDIRINST], [for internal use by nmh test suite])
-AS_IF([test -n "$NMHETCDIRINST"], [nmhetcdirinst=$NMHETCDIRINST]
-      AC_SUBST([nmhetcdirinst]))
-
 dnl ----------------
 dnl CHECK STRUCTURES
 dnl ----------------

diff --git a/test/common.sh.in b/test/common.sh.in
index 5461b01..a4e75bc 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -13,9 +13,6 @@ test -z "$exec_prefix"  &&  exec_prefix=@exec_prefix@
 test -z "$bindir"  &&  bindir="@bindir@"
 test -z "$mandir"  &&  mandir="@mandir@"
 test -z "$nmhetcdir"  &&  nmhetcdir="@sysconfdir@/nmh"
-#### The following doesn't support running the distcheck version of
-#### test-mhparam standalone, but only via make distcheck.
-test -z "$nmhetcdirinst"  &&  nmhetcdirinst="@nmhetcdirinst@$nmhetcdir"
 test -z "$nmhlibexecdir"  &&  nmhlibexecdir="@libexecdir@/nmh"
 test -z "$supported_locks"  &&  supported_locks="@supported_locks@"
 test -z "$default_locking"  &&  default_locking="@default_locking@"
@@ -292,6 +289,15 @@ postproc: ${MH_LIBEXEC_DIR}/post
 showproc: ${MH_LIBEXEC_DIR}/mhl
 EOF
 
+  for f in MailAliases components digestcomps distcomps forwcomps mhl.body \
+           mhl.digest mhl.format mhl.forward mhl.headers mhl.reply \
+           mhn.defaults rcvdistcomps replcomps replgroupcomps scan.MMDDYY \
+           scan.YYYYMMDD scan.curses scan.default scan.highlighted scan.mailx \
+          scan.nomime scan.size scan.time scan.timely scan.unseen
+  do
+    cp "${MH_INST_DIR}${nmhetcdir}/${f}" "${MH_TEST_DIR}/Mail" || exit 1
+  done
+
   folder -create +inbox > /dev/null
   # create 10 basic messages
   for i in 1 2 3 4 5 6 7 8 9 10;

diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index 8a48b8d..7d2c602 100755 (executable)
--- a/test/mhparam/test-mhparam
+++ b/test/mhparam/test-mhparam
@@ -96,7 +96,7 @@ $MH_INST_DIR$nmhlibexecdir/mhl
 nmh-`cat ${srcdir}/VERSION`
 $bindir/whatnow
 $bindir/whom
-$nmhetcdirinst
+$nmhetcdir
 $MH_LIBEXEC_DIR
 fcntl
 ${default_locking}