rewrite sed logic used in Makefiles and move into dosubst awk script.

include 'bin' and its files in dist files, this is where dosubst is located.

While the invocation (passing of the variables)
is not optimal (yet, will be changed), this
will in the end allow sharing code between Makefiles better,
and maybe drop sed usage in the future.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/gns/test_gnunet_gns.sh.in b/src/gns/test_gnunet_gns.sh.in
index 66bed0516..8cdd062c7 100755
--- a/src/gns/test_gnunet_gns.sh.in
+++ b/src/gns/test_gnunet_gns.sh.in
@@ -8,9 +8,9 @@
 # but this works for now.
 dir=$(dirname "$0")
 
-if test -e @pkgdatadir@/existence.sh
+if test -e @PKGDATADIRECTORY@/existence.sh
 then
-    . @pkgdatadir@/existence.sh
+    . @PKGDATADIRECTORY@/existence.sh
 else
     . $dir/../../contrib/build-common/sh/lib.sh/existence.sh
 fi
@@ -22,7 +22,7 @@ fi
 $LOCATION --version
 if test $? != 0
 then
-    echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
+    echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
     exit 77
 fi