diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-30 02:45:23 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-30 02:45:23 +0100 |
| commit | 219e21c7799972538eff55ebddf0e5380efc904b (patch) | |
| tree | 3754b148c7d05d7f843a4094c2858e2ecb681b0c | |
| parent | 522aea1093a598246346b3e1c426505c344fe19a (diff) | |
| download | gnulib-219e21c7799972538eff55ebddf0e5380efc904b.tar.gz | |
maintainer-makefile: Determine gnulib's location on disk correctly.
* top/maint.mk (gnulib_dir): Give priority to $(GNULIB_SRCDIR) over
$(srcdir)/gnulib.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | top/maint.mk | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,5 +1,11 @@ 2023-01-29 Bruno Haible <bruno@clisp.org> + maintainer-makefile: Determine gnulib's location on disk correctly. + * top/maint.mk (gnulib_dir): Give priority to $(GNULIB_SRCDIR) over + $(srcdir)/gnulib. + +2023-01-29 Bruno Haible <bruno@clisp.org> + Fix compilation errors with CC="clang -D_FORTIFY_SOURCE=2" on Android. Reported by Alexey Rochev <equeim@gmail.com> in <https://lists.gnu.org/archive/html/bug-gnu-libiconv/2023-01/msg00019.html>. 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 |