diff options
| author | Simon Josefsson <simon@josefsson.org> | 2021-01-26 16:24:54 +0100 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2021-01-26 16:24:54 +0100 |
| commit | 87b45614e23838fe9cba9577107186789e4f8601 (patch) | |
| tree | 369bb39d1531b7962291668a2b21ae0c5f3cd2a4 | |
| parent | 3b732e789cfb83917814aba4446f10b3bd8a9355 (diff) | |
| download | gnulib-87b45614e23838fe9cba9577107186789e4f8601.tar.gz | |
maintainer-makefile: Mimic bootstrap's gnulib-srcdir guessing.
* top/maint.mk (gnulib_dir): If $(srcdir)/gnulib doesn't exist,
fall back to $GNULIB_SRCDIR.
| -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. |