aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2014-12-31 07:15:09 -0800
committerPaul Eggert2014-12-31 07:15:43 -0800
commit93796baeee0707c77959ffad8f6c46e26c23bbbf (patch)
treee64358268259cbc95448a175fb553476028d0555
parent9758516441411e217905ea07208152292775f32e (diff)
downloademacs-93796baeee0707c77959ffad8f6c46e26c23bbbf.tar.gz
emacs-93796baeee0707c77959ffad8f6c46e26c23bbbf.zip
* autogen.sh: Port better to non-GNU 'cp'.
Problem reported by Han Boetes.
-rw-r--r--ChangeLog5
-rwxr-xr-xautogen.sh2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b161abf11b..2d02bdff3ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12014-12-31 Paul Eggert <eggert@cs.ucla.edu>
2
3 * autogen.sh: Port better to non-GNU 'cp'.
4 Problem reported by Han Boetes.
5
12014-12-28 Paul Eggert <eggert@cs.ucla.edu> 62014-12-28 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * build-aux/git-hooks/commit-msg: Allow tabs. 8 * build-aux/git-hooks/commit-msg: Allow tabs.
diff --git a/autogen.sh b/autogen.sh
index 69812cdcfe0..30e1877fbae 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -229,7 +229,7 @@ if test -d .git/hooks; then
229 *--backup*--verbose*) 229 *--backup*--verbose*)
230 cp_options='--backup=numbered --verbose';; 230 cp_options='--backup=numbered --verbose';;
231 *) 231 *)
232 cp_options='';; 232 cp_options='-f';;
233 esac 233 esac
234 234
235 if test -n "$tailored_hooks"; then 235 if test -n "$tailored_hooks"; then