summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--Makefile.in8
2 files changed, 16 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e72ce9c..02385d03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-01-10 Bruno Haible <bruno@clisp.org>
+
+ Fix handling of MAKEFLAGS variable.
+
+ * Makefile.in (MAKE_K_FLAGS): Improved definition,
+ as explained and discussed in
+
+ http://lists.gnu.org/archive/html/groff/2012-01/msg00039.html
+
2012-01-03 Ingo Schwarze <schwarze@usta.de>
Improve parallel builds.
diff --git a/Makefile.in b/Makefile.in
index 5b8fe8ef..0cc3b4de 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -546,7 +546,13 @@ MDEFINES= \
"top_srcdir=$(top_srcdir)" \
"version=$(version)"
-MAKE_K_FLAG=`case "$(MAKEFLAGS)" in *k*) echo ' -k ';; esac`
+MAKE_K_FLAG=`for f in x $(MAKEFLAGS); do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) echo ' -k ';; \
+ esac; \
+ done`
+
INCDIRS=\
src/include