From e003125b0400d055ba961b89eea094bf6774b1b2 Mon Sep 17 00:00:00 2001
From: Daniel Borkmann <dborkman@redhat.com>
Date: Mon, 29 Jul 2013 18:29:17 +0200
Subject: build: fix up GIT_PEOPLE and GIT_LOG macros

Fix them up so that a proper changelog can be generated automatically.
Also while at it, add two "hidden" targets that can be used to test
their output.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
---
 Cmds | 4 ++--
 Misc | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Cmds b/Cmds
index b544dae..c0a9e22 100644
--- a/Cmds
+++ b/Cmds
@@ -35,7 +35,7 @@ GZIP = gzip --best -c
 GIT_ARCHIVE = git archive --prefix=netsniff-ng-$(VERSION_SHORT)/ v$(VERSION_SHORT) | \
 	      $(1) > ../netsniff-ng-$(VERSION_SHORT).tar.$(2)
 GIT_TAG = git tag -a v$(VERSION_SHORT) -s -m "$(VERSION_SHORT) release"
-GIT_LOG = git shortlog -n --not $(shell git describe --always --abbrev=0 --tags)
+GIT_LOG = git shortlog -n $(shell git tag | tail -n2 | head -1)..HEAD
 GIT_REM = git ls-files -o | xargs rm -rf
-GIT_PEOPLE = git log --no-merges $(VERSION_SHORT)..HEAD | grep Author: | cut -d: -f2 | \
+GIT_PEOPLE = git log --no-merges $(shell git tag | tail -n2 | head -1)..HEAD | grep Author: | cut -d: -f2 | \
 	     cut -d\< -f1 | sort | uniq -c | sort -nr
diff --git a/Misc b/Misc
index 4acf920..f06d095 100644
--- a/Misc
+++ b/Misc
@@ -11,6 +11,12 @@ tarball: tarball.gz tarball.bz2 tarball.xz
 tag:
 	$(GIT_TAG)
 
+people:
+	$(GIT_PEOPLE)
+
+log:
+	$(GIT_LOG)
+
 announcement:
 	$(Q)echo -e "netsniff-ng $(VERSION_SHORT) has been released to the public (http://netsniff-ng.org/).\n" > .MAIL_MSG
 	$(Q)echo -e "It can be fetched via Git, through:\n" >> .MAIL_MSG
-- 
cgit v1.2.3-54-g00ecf