summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2021-09-20 09:40:47 +0200
committerSimon Josefsson <simon@josefsson.org>2021-09-20 09:40:47 +0200
commit9aca7b67333fd0a90bf56104325ce96199644451 (patch)
treef57bc791b7a9d81acccb249ebac308763b093b40
parent43127a5684cb17f653354260ccd32a359cc6baef (diff)
downloadgnulib-9aca7b67333fd0a90bf56104325ce96199644451.tar.gz
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.
-rw-r--r--ChangeLog6
-rw-r--r--top/maint.mk2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ddc28ddc23..6d5ba08541 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2021-09-20 Simon Josefsson <simon@josefsson.org>
+
+ 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 <bruno@clisp.org>
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}; \