summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--top/maint.mk6
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 464adec026..1849089052 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2019-01-06 Bruno Haible <bruno@clisp.org>
+ maintainer-makefile: Make the configure.ac section optional.
+ * top/maint.mk (GREP, SED): Define if not defined.
+
+2019-01-06 Bruno Haible <bruno@clisp.org>
+
localename: Assume setlocale function.
* lib/localename.c (gl_locale_name_posix): Assume setlocale exists.
* m4/localename.m4 (gl_LOCALENAME): Don't test whether setlocale exists.
diff --git a/top/maint.mk b/top/maint.mk
index 4b574103a3..4e37efeb56 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -21,6 +21,12 @@
# ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
ME := maint.mk
+# These variables ought to be defined through the configure.ac section
+# of the module description. But some packages import this file directly,
+# ignoring the module description.
+GREP ?= grep
+SED ?= sed
+
# Helper variables.
_empty =
_sp = $(_empty) $(_empty)