Skip to content

Commit

Permalink
Check for repeated tags in 'make tag'
Browse files Browse the repository at this point in the history
And remove the ifdef VERSION, since $(VERSION) is always defined now.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
David Woodhouse authored and David Woodhouse committed Jun 27, 2011
1 parent 67fc7a5 commit ed39b69
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile.am
Expand Up @@ -38,11 +38,12 @@ dist-hook:
@if ! git diff-index --name-only --exit-code HEAD; then \
echo "*** ERROR: Uncommitted changes in above files"; exit 1; fi

ifdef VERSION
tag:
@git update-index --refresh --unmerged
@if ! git diff-index --name-only --exit-code HEAD; then \
echo "*** ERROR: Uncommitted changes in above files"; exit 1; fi
@if git rev-parse --verify v$(VERSION) > /dev/null; then \
echo "*** ERROR: Version v$(VERSION) is already tagged"; exit 1; fi
@sed 's/AC_INIT.*/AC_INIT(openconnect, $(VERSION))/' -i configure.ac
@sed 's/^v=.*/v="v$(VERSION)"/' -i version.sh
@( echo "s/Last modified: .*/Last modified: $(shell date)/" ;\
Expand All @@ -57,4 +58,3 @@ tag:
@git tag v$(VERSION)
@./autogen.sh

endif

0 comments on commit ed39b69

Please sign in to comment.