[GNUnet-SVN] [gnunet] branch master updated: revert sed and fix a typo

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 4afdc64fb revert sed and fix a typo
4afdc64fb is described below

commit 4afdc64fbb5e9189e9d7a1bc9a1e2a419af68968
Author: ng0 <address@hidden>
AuthorDate: Tue Feb 19 13:13:03 2019 +0000

    revert sed and fix a typo
---
 src/gns/Makefile.am                  | 7 -------
 src/gns/gnunet-gns-proxy-setup-ca.in | 5 +++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index cc633698b..991c40ae3 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -108,14 +108,7 @@ do_subst = $(SED) -e 's,address@hidden@],${xPFX},g'
 
 gnunet-gns-proxy-setup-ca: gnunet-gns-proxy-setup-ca.in
        $(do_subst) < $(top_srcdir)/src/gns/gnunet-gns-proxy-setup-ca.in > 
gnunet-gns-proxy-setup-ca
-       ifeq ($(HAVE_OPENSSL), 1)
-               $(do_subst_openssl) < 
$(top_srcdir)/src/gns/gnunet-gns-proxy-setup-ca
-       endif
-       ifeq ($(HAVE_CERTUTIL), 1) 
-               $(do_subst_certutil) < 
$(top_srcdir)/src/gns/gnunet-gns-proxy-setup-ca
-       endif 
        chmod +x gnunet-gns-proxy-setup-ca
-else:
 
 bin_SCRIPTS = gnunet-gns-proxy-setup-ca
 
diff --git a/src/gns/gnunet-gns-proxy-setup-ca.in 
b/src/gns/gnunet-gns-proxy-setup-ca.in
index cd3be5cea..00fc2d227 100644
--- a/src/gns/gnunet-gns-proxy-setup-ca.in
+++ b/src/gns/gnunet-gns-proxy-setup-ca.in
@@ -11,8 +11,9 @@ then
     exit 1
 fi
 
address@hidden@
address@hidden@
+# Keep it simple so that people can install the tools later on.
+OPENSSLBIN=openssl
+CERTUTILBIN=certutil
 
 echo "Generating CA"
 options=''

-- 
To stop receiving notification emails like this one, please contact
address@hidden