revert sed and fix a typo

diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index cc633698b6a1281e4dba270b280b875e0b3f5fbd..991c40ae307367977097890b054e768231ae8ed6 100644 (file)
--- 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 cd3be5ceac0d860ed831f3a6e108382cab121711..00fc2d227c62c3f206f38e778cf7f45542bfc983 100644 (file)
--- 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=''