aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README8
-rw-r--r--src/util/Makefile.am5
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:
53- postgres >= 9.5 (alternative to sqlite) 53- postgres >= 9.5 (alternative to sqlite)
54- Texinfo >= 5.2 [*1] 54- Texinfo >= 5.2 [*1]
55- makeinfo >= 4.8 55- makeinfo >= 4.8
56- make[*3]
56- which (bootstrap script and some Makefiles) 57- which (bootstrap script and some Makefiles)
57- gettext 58- gettext
58- zlib 59- zlib
59- pkg-config
60 60
61 61
62These are the dependencies for GNUnet's testsuite: 62These are the dependencies for GNUnet's testsuite:
@@ -107,6 +107,12 @@ Recommended autotools for compiling the Git version are:
107 Contrary to the name, texi2mdoc does not require texinfo, 107 Contrary to the name, texi2mdoc does not require texinfo,
108 It is a standalone ISO C utility. 108 It is a standalone ISO C utility.
109 109
110[*3] GNU make introduced the != operator in version 4.0.
111 GNU make was released in october 2013, reasonable to
112 be widespread by now. If this is not working out for
113 you, open a bug so that we can get a more portable
114 fix in.
115
110Requirements 116Requirements
111============ 117============
112 118
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
239# This is horrible, but compared to the alternatives and the solution 239# This is horrible, but compared to the alternatives and the solution
240# which preceded this it is a good compromise and good enough for one 240# which preceded this it is a good compromise and good enough for one
241# file. Everyone else is invited to patch it locally. 241# file. Everyone else is invited to patch it locally.
242# In case someone reads this file and is wondering about the
243# assignment operator below, it's explained here:
244# https://lists.gnu.org/archive/html/make-w32/2013-10/msg00021.html
242 245
243xENV=$(shell which env) 246xENV != which env
244 247
245do_subst = $(SED) -e 's,[@]ENV[@],${xENV},g' 248do_subst = $(SED) -e 's,[@]ENV[@],${xENV},g'
246 249