diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | top/maint.mk | 6 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2021-01-26 Simon Josefsson <simon@josefsson.org> + + 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 <bruno@clisp.org> 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. |