From 87b45614e23838fe9cba9577107186789e4f8601 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Tue, 26 Jan 2021 16:24:54 +0100
Subject: maintainer-makefile: Mimic bootstrap's gnulib-srcdir guessing.

* top/maint.mk (gnulib_dir): If $(srcdir)/gnulib doesn't exist,
fall back to $GNULIB_SRCDIR.
---
 top/maint.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'top')

diff --git a/top/maint.mk b/top/maint.mk
index 934f23d56b..ae3a8170a8 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -64,7 +64,11 @@ 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
+gnulib_dir ?= $(shell if test -d $(srcdir)/gnulib; then \
+			echo $(srcdir)/gnulib; \
+		else \
+			echo ${GNULIB_SRCDIR}; \
+		fi)
 
 # You can override this variable in cfg.mk to set your own regexp
 # matching files to ignore.
-- 
cgit v1.2.1