* top/maint.mk (gnulib_dir): Give priority to $(GNULIB_SRCDIR) over
$(srcdir)/gnulib.
+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.
# 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