summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2014-06-24 11:51:44 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2014-06-24 11:51:44 +0300
commit02e1fb17d864f2658ab14353e0bd026949c9f8a4 (patch)
tree20b46dd803598974651831323f2f6602eace649c
parentda310fecb90f67093635e8bd4babc1e328c4ebc1 (diff)
downloadpaxutils-02e1fb17d864f2658ab14353e0bd026949c9f8a4.tar.gz
Make.rules: New variable changelog_amend_file. Remove duplicated copyleft header.
-rw-r--r--Make.rules32
1 files changed, 8 insertions, 24 deletions
diff --git a/Make.rules b/Make.rules
index 09ad1c1..a454459 100644
--- a/Make.rules
+++ b/Make.rules
@@ -1,26 +1,6 @@
# This file is part of GNU paxutils
#
-# Copyright (c) 2009 Free Software Foundation, Inc.
-#
-# Written by Sergey Poznyakoff
-#
-# GNU Paxutils is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3, or (at your option) any later
-# version.
-#
-# GNU Paxutils is distributed in the hope that it will be useful, but
-# without any warranty; without even the implied warranty of
-# merchantability or fitness for a particular purpose. see the gnu general
-# public license for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with GNU Paxutils; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This file is part of GNU paxutils
-#
-# Copyright (c) 2009 Free Software Foundation, Inc.
+# Copyright (c) 2009, 2014 Free Software Foundation, Inc.
#
# Written by Sergey Poznyakoff
#
@@ -39,9 +19,10 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# Define the following variables in order to use the ChangeLog rule below:
-# prev_change_log [optional] Name of the previous ChangeLog file.
-# gen_start_date [optional] Start ChangeLog from this date.
-# changelog_dir [mandatory] Directory where to create ChangeLog
+# prev_change_log [optional] Name of the previous ChangeLog file.
+# gen_start_date [optional] Start ChangeLog from this date.
+# changelog_dir [mandatory] Directory where to create ChangeLog
+# changelog_amend_file [optional] Amendment file
.PHONY: ChangeLog
ChangeLog:
@@ -50,6 +31,9 @@ ChangeLog:
if test -n "$(gen_start_date)"; then \
cmd="$$cmd --since=\"$(gen_start_date)\""; \
fi; \
+ if test -n "$(changelog_amend_file)"; then \
+ cmd="$$cmd --amend=$(changelog_amend_file)"; \
+ fi; \
$$cmd --format='%s%n%n%b%n' | \
sed '/<unknown>$$/d' | fmt -s > $(changelog_dir)/cl-t; \
if test -n "$(prev_change_log)" && test -f "$(prev_change_log)"; \