Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/nmh

diff --git a/Makefile.am b/Makefile.am
index 3713920..af0c66a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -119,7 +119,7 @@ clean-local:
 ##
 ## Stuff that should be cleaned via "make maintainer-clean"
 ##
-MAINTAINERCLEANFILES = cscope.files cscope.out cscope.in.out cscope.po.out *.plist
+MAINTAINERCLEANFILES = atags cscope.files cscope.out cscope.in.out cscope.po.out *.plist
 
 ##
 ## And our own superclean, to get everything left by maintainer-clean.

diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index ba421bf..499fade 100755 (executable)
--- a/docs/contrib/build_nmh
+++ b/docs/contrib/build_nmh
@@ -131,7 +131,7 @@ if install-mh -check >/dev/null 2>&1; then
 
   config_prefix=`cd $mhbin/.. && pwd`
 
-  mtsconf=`dirname "$mhbin"`/etc/mts.conf
+  mtsconf=`mhparam etcdir`/mts.conf
   if [ -f "$mtsconf" ]; then
     mts_entry=`grep '^mts:' "$mtsconf"`
     if [ "$mts_entry" ]; then

diff --git a/etc/mhn.defaults.sh b/etc/mhn.defaults.sh
index 7b89449..26e5f91 100755 (executable)
--- a/etc/mhn.defaults.sh
+++ b/etc/mhn.defaults.sh
@@ -316,7 +316,7 @@ fi
 # access-type.
 case "`uname`" in
   FreeBSD)
-       echo "nmh-access-url: fetch -a -o -" >> $TMP
+       echo "nmh-access-url: fetch -o -" >> $TMP
        ;;
   *)
        PGM=`$SEARCHPROG "$SEARCHPATH" curl`