summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-02-19 13:13:03 +0000
committerng0 <ng0@n0.is>2019-02-19 13:13:03 +0000
commit4afdc64fbb5e9189e9d7a1bc9a1e2a419af68968 (patch)
treed95f9b865893bdb8d7f04d2baee2d31442bcf46e
parent627abb89b8a9b25d57a06c913cc14d3e90013320 (diff)
revert sed and fix a typo
-rw-r--r--src/gns/Makefile.am7
-rw-r--r--src/gns/gnunet-gns-proxy-setup-ca.in5
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,[@]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=''