From 219e21c7799972538eff55ebddf0e5380efc904b Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Mon, 30 Jan 2023 02:45:23 +0100
Subject: maintainer-makefile: Determine gnulib's location on disk correctly.

* top/maint.mk (gnulib_dir): Give priority to $(GNULIB_SRCDIR) over
$(srcdir)/gnulib.
---
 top/maint.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'top')

diff --git a/top/maint.mk b/top/maint.mk
index 034e25be3d..44f3db9d9d 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -64,10 +64,10 @@ 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 -f $(srcdir)/gnulib/gnulib-tool; then \
-			echo $(srcdir)/gnulib; \
+gnulib_dir ?= $(shell if test -n "$(GNULIB_SRCDIR)" && test -f "$(GNULIB_SRCDIR)/gnulib-tool"; then \
+			echo "$(GNULIB_SRCDIR)"; \
 		else \
-			echo ${GNULIB_SRCDIR}; \
+			echo $(srcdir)/gnulib; \
 		fi)
 
 # You can override this variable in cfg.mk to set your own regexp
-- 
cgit v1.2.1