From 0abe9a8803649485132de7a8b782e1e152c9dd19 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 25 Feb 2019 01:35:41 +0000 Subject: [PATCH] src/util: Use make 4.0 assignment operator --- README | 8 +++++++- src/util/Makefile.am | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/README b/README index 4cfba4070..232a3c61f 100644 --- a/README +++ b/README @@ -53,10 +53,10 @@ These are the direct dependencies for running GNUnet: - postgres >= 9.5 (alternative to sqlite) - Texinfo >= 5.2 [*1] - makeinfo >= 4.8 +- make[*3] - which (bootstrap script and some Makefiles) - gettext - zlib -- pkg-config These are the dependencies for GNUnet's testsuite: @@ -107,6 +107,12 @@ Recommended autotools for compiling the Git version are: Contrary to the name, texi2mdoc does not require texinfo, It is a standalone ISO C utility. +[*3] GNU make introduced the != operator in version 4.0. + GNU make was released in october 2013, reasonable to + be widespread by now. If this is not working out for + you, open a bug so that we can get a more portable + fix in. + Requirements ============ diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 755f91a11..d1aa8aa9b 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -239,8 +239,11 @@ endif # This is horrible, but compared to the alternatives and the solution # which preceded this it is a good compromise and good enough for one # file. Everyone else is invited to patch it locally. +# In case someone reads this file and is wondering about the +# assignment operator below, it's explained here: +# https://lists.gnu.org/archive/html/make-w32/2013-10/msg00021.html -xENV=$(shell which env) +xENV != which env do_subst = $(SED) -e 's,[@]ENV[@],${xENV},g' -- 2.25.1