diff options
| author | Eric Blake <eblake@redhat.com> | 2016-12-30 20:37:10 -0600 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2016-12-31 07:10:25 -0600 |
| commit | 5996001fc550d7e12292f22f312176014f787243 (patch) | |
| tree | 571c1974489f0c3b644d6c4bfcbdf55cbb5b1b5b /top/maint.mk | |
| parent | ffff79dad7f396cf0bfe7b72d212da72245a6f01 (diff) | |
| download | gnulib-5996001fc550d7e12292f22f312176014f787243.tar.gz | |
maint.mk: hoist gnulib_dir definition earlier
Commit 1894933 introduced a temporary warning during all uses of 'make':
Can't open /lib/intprops.h: No such file or directory.
due to an early evaluation of $(shell) prior to the default definition
of $(gnulib_dir). While that has been fixed in commit ffff79d, hoisting
the definition to the top will prevent further edits from inadvertently
reintroducing the problem.
* top/maint.mk (gnulib_dir): Move near top of file.
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'top/maint.mk')
| -rw-r--r-- | top/maint.mk | 5 |
1 files changed, 4 insertions, 1 deletions
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 |