* clcommit.m4sh, config/mailnotify.m4sh: Updated again, but

this time after merging local changes back first.

diff --git a/ChangeLog b/ChangeLog
index f9670a61bff6d6122c8bf180c542fadd5f76d2d2..beb19ed88a57befe490d7b99f71cad9095338ee0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-22  Gary V. Vaughan  <gary@gnu.org>
 
+       * clcommit.m4sh, config/mailnotify.m4sh: Updated again, but
+       this time after merging local changes back first.
+
        * clcommit.m4sh, config/mailnotify.m4sh: Updated from
        cvs-utils--tla--1.0 to fix quoting of metachars in patch names.
 

diff --git a/clcommit.m4sh b/clcommit.m4sh
index 48a3de4e3f9d6506def65f33691e6be65892e1e4..32116c8109ee31574fee6e807796c2af1160ef1a 100644 (file)
--- a/clcommit.m4sh
+++ b/clcommit.m4sh
@@ -2,7 +2,7 @@ m4_define([_m4_divert(SCRIPT)], 100)
 m4_divert_push([SCRIPT])#!/bin/sh
 # @configure_input@
 
-# clcommit (GNU @PACKAGE@) version 0.13
+# clcommit (GNU @PACKAGE@) version 0.14
 # Written by Gary V. Vaughan <gary@gnu.org>
 # and Alexandre Oliva <aoliva@redhat.com>
 
@@ -76,6 +76,7 @@ m4_divert_push([SCRIPT])#!/bin/sh
 : ${MAILNOTIFY="mailnotify"}
 : ${MKSTAMP="mkstamp"}
 
+test -f "config/$MAILNOTIFY" && MAILNOTIFY="config/$MAILNOTIFY"
 test -f "config/$MKSTAMP" && MKSTAMP="config/$MKSTAMP"
 
 PROGRAM=clcommit

diff --git a/config/mailnotify.m4sh b/config/mailnotify.m4sh
index 8735542735bb0bf2dbabb7904052a56fe777b119..539cbe268bd9237bc652efb072ffdcc33071edfc 100644 (file)
--- a/config/mailnotify.m4sh
+++ b/config/mailnotify.m4sh
@@ -2,7 +2,7 @@ m4_define([_m4_divert(SCRIPT)], 100)
 m4_divert_push([SCRIPT])#!/bin/sh
 # @configure_input@
 
-# mailnotify (GNU @PACKAGE@) version 0.5
+# mailnotify (GNU @PACKAGE@) version 0.6
 # Written by Gary V. Vaughan <gary@gnu.org>
 
 # Copyright (C) 2004 Free Software Foundation, Inc.
@@ -295,7 +295,7 @@ func_sendmail ()
 
     save_IFS="$IFS"
     IFS=':'
-    for try_sendmail_dir in /usr/lib:/usr/sbin:$PATH; do
+    for try_sendmail_dir in $PATH; do
         IFS="$save_IFS"
        PATH="$save_PATH"
        if test -x "$try_sendmail_dir/$SENDMAIL"; then