summaryrefslogtreecommitdiff
path: root/maint.mk
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2013-10-29 18:29:16 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2013-10-29 18:29:16 +0100
commitb9db38d7f5451c281f7ba345cc3f71e2240ba23a (patch)
tree685a8ac3cc59fcdc513382396c6bdb5627f0f80c /maint.mk
parent3327d943c46afad17f64b5500663b80059d39aa3 (diff)
downloadgnutls-b9db38d7f5451c281f7ba345cc3f71e2240ba23a.tar.gz
updated gnulib.
Diffstat (limited to 'maint.mk')
-rw-r--r--maint.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/maint.mk b/maint.mk
index c1b786f89f..8cb58f8415 100644
--- a/maint.mk
+++ b/maint.mk
@@ -1283,7 +1283,8 @@ vc-diff-check:
rel-files = $(DIST_ARCHIVES)
gnulib_dir ?= $(srcdir)/gnulib
-gnulib-version = $$(cd $(gnulib_dir) && git describe)
+gnulib-version = $$(cd $(gnulib_dir) \
+ && { git describe || git rev-parse --short=10 HEAD; } )
bootstrap-tools ?= autoconf,automake,gnulib
# If it's not already specified, derive the GPG key ID from
@@ -1424,6 +1425,7 @@ alpha beta stable: $(local-check) writable-files $(submodule-checks)
$(AM_V_at)$(MAKE) -s emit_upload_commands RELEASE_TYPE=$@
release:
+ $(AM_V_GEN)$(MAKE) _version
$(AM_V_GEN)$(MAKE) $(release-type)
# Override this in cfg.mk if you follow different procedures.