From: ng0 <ng0@n0.is>
Date: Tue, 19 Feb 2019 13:13:03 +0000 (+0000)
Subject: revert sed and fix a typo
X-Git-Tag: v0.11.0~63^2~32^2~12
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4afdc64fbb5e9189e9d7a1bc9a1e2a419af68968;p=oweals%2Fgnunet.git

revert sed and fix a typo
---

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,[@]PREFIX[@],${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
 
-OPENSSLBIN=@OPENSSL@
-CERTUTILBIN=@CERTUTIL@
+# Keep it simple so that people can install the tools later on.
+OPENSSLBIN=openssl
+CERTUTILBIN=certutil
 
 echo "Generating CA"
 options=''