Skip to content

Commit efe8798

Browse files
committed
Protect against substring matches in release-hook
Also, ordering of targets to match other projects in same family. Signed-off-by: Joachim Wiberg <[email protected]>
1 parent 503f593 commit efe8798

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

Makefile.am

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@ dist_doc_DATA = README.md ChangeLog.md UNLICENSE
44
endif
55
SUBDIRS = doc src
66

7+
## Generate .deb package
8+
package:
9+
@debuild -uc -us -B --lintian-opts --profile debian -i -I --show-overrides
10+
711
## Check if tagged in git
812
release-hook:
9-
@if [ ! `git tag | grep $(PACKAGE_VERSION)` ]; then \
13+
@if [ "x`git tag -l v$(PACKAGE_VERSION)|grep $(PACKAGE_VERSION)`" = "x" ]; then \
1014
echo; \
1115
printf "\e[1m\e[41mCannot find release tag $(PACKAGE_VERSION)\e[0m\n"; \
1216
printf "\e[1m\e[5mDo release anyway?\e[0m "; read yorn; \
@@ -22,9 +26,6 @@ release-hook:
2226
echo; \
2327
fi
2428

25-
package:
26-
@debuild -uc -us -B --lintian-opts --profile debian -i -I --show-overrides
27-
2829
## Target to run when building a release
2930
release: release-hook distcheck
3031
@for file in $(DIST_ARCHIVES); do \

0 commit comments

Comments
 (0)