bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] maint.mk: ensure gnulib_dir is defined before use in shell


From: Eric Blake
Subject: [PATCH] maint.mk: ensure gnulib_dir is defined before use in shell
Date: Fri, 30 Dec 2016 20:42:14 -0600

Otherwise, we get warnings about:

Can't open /lib/intprops.h: No such file or directory.

in projects that don't define a $(gnulib_dir) override in cfg.mk.

* top/maint.mk (gnulib_dir): Hoist earlier.

Signed-off-by: Eric Blake <address@hidden>
---

Appears to work for me, but I'll wait until tomorrow or a review
before pushing.

 ChangeLog    | 5 +++++
 top/maint.mk | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index eb5867f..e69ce32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-30  Eric Blake  <address@hidden>
+
+       maint.mk: ensure gnulib_dir is defined before use in shell
+       * top/maint.mk (gnulib_dir): Hoist earlier.
+
 2016-12-30  Jim Meyering  <address@hidden>

        maint.mk: improve sc_prohibit_intprops_without_use
diff --git a/top/maint.mk b/top/maint.mk
index 6eb9361..d009cdf 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -20,6 +20,7 @@
 # This is reported not to work with make-3.79.1
 # ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
 ME := maint.mk
+gnulib_dir ?= $(srcdir)/gnulib

 # Helper variables.
 _empty =
@@ -1288,7 +1289,6 @@ vc-diff-check:

 rel-files = $(DIST_ARCHIVES)

-gnulib_dir ?= $(srcdir)/gnulib
 gnulib-version = $$(cd $(gnulib_dir)                           \
                     && { git describe || git rev-parse --short=10 HEAD; } )
 bootstrap-tools ?= autoconf,automake,gnulib
-- 
2.9.3




reply via email to

[Prev in Thread] Current Thread [Next in Thread]