rmailsum.el minor optional argument fix

[gnu-emacs] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 614bdc71b61afbf9f8861da82335869312be29ae..bc9c5a008e034479aa1c146332de6f0b318399c4 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 ### autogen.sh - tool to help build Emacs from a repository checkout
 
-## Copyright (C) 2011-2014 Free Software Foundation, Inc.
+## Copyright (C) 2011-2015 Free Software Foundation, Inc.
 
 ## Author: Glenn Morris <rgm@gnu.org>
 ## Maintainer: emacs-devel@gnu.org
@@ -226,6 +226,7 @@ if test -d .git/hooks; then
        tailored_hooks="$tailored_hooks $hook"
     done
     for hook in applypatch-msg pre-applypatch; do
+       test ! -r .git/hooks/$hook.sample ||
        cmp .git/hooks/$hook.sample .git/hooks/$hook >/dev/null 2>&1 ||
        sample_hooks="$sample_hooks $hook"
     done
@@ -237,7 +238,7 @@ if test -d .git/hooks; then
          *--backup*--verbose*)
            cp_options='--backup=numbered --verbose';;
          *)
-           cp_options='';;
+           cp_options='-f';;
        esac
 
        if test -n "$tailored_hooks"; then