summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rühsen <tim.ruehsen@gmx.de>2018-06-04 16:15:07 +0200
committerTim Rühsen <tim.ruehsen@gmx.de>2018-06-14 11:07:47 +0200
commit9018d86aca45a08f00d15067198e3949beec1a8a (patch)
tree4b5b5f608ffb960af2de13d140087d2a32f48301
parent16031cfe86d6d8b1bde09f926b23a969be7af104 (diff)
downloadgnutls-9018d86aca45a08f00d15067198e3949beec1a8a.tar.gz
Fix creation of ChangeLog for 'make distcheck'
Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
-rw-r--r--Makefile.am3
-rw-r--r--cfg.mk3
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 79d892b5d9..f7da58920a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -166,9 +166,8 @@ dist-hook: libopts-check symbol-check
make -C doc/ compare-makefile
make -C doc/ compare-exported
make -C doc/manpages compare-makefile
- rm -f ChangeLog
make ChangeLog
- cp -f ChangeLog $(distdir)/
+ mv ChangeLog $(distdir)
$(SED) 's/\@VERSION\@/$(VERSION)/g' -i $(distdir)/src/args-std.def
$(SED) 's/\@YEAR\@/$(YEAR)/g' -i $(distdir)/src/args-std.def
$(SED) 's/\@PACKAGE_BUGREPORT\@/$(PACKAGE_BUGREPORT)/g' -i $(distdir)/src/args-std.def
diff --git a/cfg.mk b/cfg.mk
index 3421ea8ecc..525d52473d 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -64,7 +64,6 @@ gl_public_submodule_commit =
autoreconf:
./bootstrap
- touch ChangeLog
update-po: refresh-po
git add $(PODIR)/*.po
@@ -109,6 +108,8 @@ clang-copy:
# Release
+# ChangeLog must be PHONY, else it isn't generated on 'make distcheck'
+.PHONY: ChangeLog
ChangeLog:
git log --no-merges --no-decorate --pretty --since="2014 November 07"|grep -v ^'commit' > ChangeLog