diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | top/maint.mk | 5 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2016-12-31 Eric Blake <eblake@redhat.com> + + maint.mk: hoist gnulib_dir definition earlier + * top/maint.mk (gnulib_dir): Move near top of file. + 2016-12-31 Jim Meyering <meyering@fb.com> maint.mk: do not always evaluate intprops-related shell diff --git a/top/maint.mk b/top/maint.mk index 64db9ee00e..46aea9b421 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -55,6 +55,10 @@ VC = $(GIT) VC_LIST = $(srcdir)/$(_build-aux)/vc-list-files -C $(srcdir) +# You can override this variable in cfg.mk if your gnulib submodule lives +# in a different location. +gnulib_dir ?= $(srcdir)/gnulib + # You can override this variable in cfg.mk to set your own regexp # matching files to ignore. VC_LIST_ALWAYS_EXCLUDE_REGEX ?= ^$$ @@ -1288,7 +1292,6 @@ vc-diff-check: rel-files = $(DIST_ARCHIVES) -gnulib_dir ?= $(srcdir)/gnulib gnulib-version = $$(cd $(gnulib_dir) \ && { git describe || git rev-parse --short=10 HEAD; } ) bootstrap-tools ?= autoconf,automake,gnulib |