From: Simon Josefsson Date: Tue, 26 Jan 2021 15:24:54 +0000 (+0100) Subject: maintainer-makefile: Mimic bootstrap's gnulib-srcdir guessing. X-Git-Tag: v1.0~3121 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=87b45614e23838fe9cba9577107186789e4f8601;p=gnulib.git maintainer-makefile: Mimic bootstrap's gnulib-srcdir guessing. * top/maint.mk (gnulib_dir): If $(srcdir)/gnulib doesn't exist, fall back to $GNULIB_SRCDIR. --- diff --git a/ChangeLog b/ChangeLog index c2bfead08c..a06ac071b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2021-01-26 Simon Josefsson + + maintainer-makefile: Mimic bootstrap's gnulib-srcdir guessing. + * top/maint.mk (gnulib_dir): If $(srcdir)/gnulib doesn't exist, + fall back to $GNULIB_SRCDIR. + 2021-01-25 Bruno Haible posix_spawn_file_actions_* tests: Fix module dependencies. 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.