From 9aca7b67333fd0a90bf56104325ce96199644451 Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Mon, 20 Sep 2021 09:40:47 +0200 Subject: maint: Avoid syntax-check failure for empty gnulib submodule. * top/maint.mk (gnulib_dir): Fall back to GNULIB_SRCDIR if submodule is not checked out. --- ChangeLog | 6 ++++++ top/maint.mk | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ddc28ddc23..6d5ba08541 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2021-09-20 Simon Josefsson + + maint: Avoid syntax-check failure for empty gnulib submodule. + * top/maint.mk (gnulib_dir): Fall back to GNULIB_SRCDIR if + submodule is not checked out. + 2021-09-19 Bruno Haible Relicense qemu.h under LGPLv2+. diff --git a/top/maint.mk b/top/maint.mk index 0aa63773cf..a03bc2e21e 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -64,7 +64,7 @@ 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 ?= $(shell if test -d $(srcdir)/gnulib; then \ +gnulib_dir ?= $(shell if test -f $(srcdir)/gnulib/gnulib-tool; then \ echo $(srcdir)/gnulib; \ else \ echo ${GNULIB_SRCDIR}; \ -- cgit v1.2.1