X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=docs%2Fcontrib%2Fbuild_nmh;h=344815db65d113ddce68dd6c8288d7b28015d16c;hb=783f1bcf7d7429121a97eb0117bf444c1a59a28e;hp=cc83974370fefb65ae3f563878b526a11ae29c63;hpb=3d21b136955bae5202ee7a7443b6745e9c5c5eea;p=mmh

diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index cc83974..344815d 100755
--- a/docs/contrib/build_nmh
+++ b/docs/contrib/build_nmh
@@ -47,7 +47,7 @@
 ####
 which=which
 ldd=ldd
-locking=
+locking=dot
 
 os=${OSTYPE:-`uname -s`}
 #### It'd be nice to have configure decide what locking style to use.
@@ -110,7 +110,9 @@ if [ $# -gt 0 ]; then
 fi
 
 #### Check to see that we're in a nmh source directory.
-if ! grep 'the authors of nmh' COPYRIGHT >/dev/null; then
+if grep 'the authors of nmh' COPYRIGHT >/dev/null; then
+  :
+else
   echo "$0: not in nmh source directory"
   exit 1
 fi
@@ -122,7 +124,7 @@ fi
 
 #### dotlocking, the usual default, requires chgrp and chmod of inc.
 installpriv=
-if [ $install -ge 1  -a  `id -u` -ne 0 ]; then
+if [ $install -ge 1  -a  `id -u` -ne 0  -a  "$OSTYPE" != cygwin ]; then
   if [ "x$locking" = x  -o  "$locking" = dot ]; then
     echo "$0: "'install requires chgrp and chmod 2755'
     echo 'so will sudo to install.  Terminate with Ctrl-C if unacceptable.'
@@ -140,10 +142,15 @@ config_smtpservers=localhost
 config_sasl=n
 config_tls=n
 config_editor=vi
-config_pager=more
+for i in more less most cat; do
+  if which $i >/dev/null 2>&1; then
+    config_pager=$i
+    break
+  fi
+done
 config_debug=n
 
-if mhparam >/dev/null 2>&1; then
+if install-mh -check >/dev/null 2>&1; then
   # Determine config options from installed nmh.
   mhparam=`which mhparam`
   mhbin=`dirname "$mhparam"`
@@ -200,7 +207,9 @@ if [ $yes -eq 0 ]; then
   read mts
   [ "$mts" ]  &&  config_mts="$mts"
 
-  if [ ! "$mts"  -o  "$mts" = smtp ]; then
+  if [ "$mts"  -o  "$mts" = smtp ]; then
+    :
+  else
     printf 'SMTP server(s), space separated [%s]: ' $config_smtpservers
     read response
     servers=`echo $response | sed -e 's/ /\\\ /g'`
@@ -291,7 +300,7 @@ if [ $status -eq 0 ]; then
 
   if [ $status -eq 0 ]; then
     [ $verbose -ge 1 ]  &&  echo testing . . .
-    checkoutput=`make $check SETGID_MAIL= 2>>$logfile`
+    checkoutput=`make $check 2>>$logfile`
     status=$?
 
     tests_summary=`echo "$checkoutput" | grep tests`
@@ -319,7 +328,8 @@ if [ $status -eq 0 ]; then
   fi
 fi
 
-grep -E 'Error|warn' $logfile
+grep 'Error' $logfile
+grep 'warn' $logfile
 [ $status -ne 0 ]  &&  echo build failed!
 [ $status -eq 0  -a  $verbose -ge 1 ]  &&  echo build completed successfully