Bump to 2.19

[platform/upstream/grep.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ba6c278..e618a00 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # Process this file with automake to create Makefile.in
 #
-# Copyright 1997-1998, 2005-2012 Free Software Foundation, Inc.
+# Copyright 1997-1998, 2005-2014 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,8 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-AUTOMAKE_OPTIONS = gnu 1.10
-ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = gnu 1.12
 
 SUBDIRS = po lib doc src tests gnulib-tests
 
@@ -46,9 +45,12 @@ gen_start_date = 2009-11-27
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
        $(AM_V_GEN)if test -d .git; then                                \
+         log_fix="$(srcdir)/build-aux/git-log-fix";                    \
+         test -e "$$log_fix"                                           \
+           && amend_git_log="--amend=$$log_fix"                        \
+           || amend_git_log=;                                          \
          $(top_srcdir)/build-aux/gitlog-to-changelog                   \
-           --amend=$(srcdir)/build-aux/git-log-fix                     \
-           --since=$(gen_start_date) > $(distdir)/cl-t;                \
-         rm -f $(distdir)/ChangeLog;                                   \
-         mv $(distdir)/cl-t $(distdir)/ChangeLog;                      \
+           $$amend_git_log --since=$(gen_start_date) > $(distdir)/cl-t && \
+           { rm -f $(distdir)/ChangeLog &&                             \
+             mv $(distdir)/cl-t $(distdir)/ChangeLog; }                \
        fi