diff options
author | ng0 <ng0@n0.is> | 2019-12-02 15:30:56 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-12-02 15:30:56 +0000 |
commit | c8e5e28048dd9605f7958ef95f2a6dd626658069 (patch) | |
tree | 52375a14cc93c4161a658b4c7a1926dda11d8909 /src/gns | |
parent | 53f35813d89de6f7c91883277129ffda3ca5b772 (diff) | |
download | gnunet-c8e5e28048dd9605f7958ef95f2a6dd626658069.tar.gz gnunet-c8e5e28048dd9605f7958ef95f2a6dd626658069.zip |
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.
Diffstat (limited to 'src/gns')
-rw-r--r-- | src/gns/Makefile.am | 9 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy-setup-ca.in | 20 | ||||
-rwxr-xr-x | src/gns/test_gnunet_gns.sh.in | 6 |
3 files changed, 15 insertions, 20 deletions
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 9f0e0bbb6..abd5d5b48 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -103,17 +103,12 @@ plugin_LTLIBRARIES = \ | |||
103 | bin_SCRIPTS = \ | 103 | bin_SCRIPTS = \ |
104 | gnunet-gns-proxy-setup-ca | 104 | gnunet-gns-proxy-setup-ca |
105 | 105 | ||
106 | # See: https://www.gnu.org/software/automake/manual/html_node/Scripts.html#Scripts | ||
107 | do_subst = $(SED) -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' | ||
108 | |||
109 | gnunet-gns-proxy-setup-ca: gnunet-gns-proxy-setup-ca.in Makefile | 106 | gnunet-gns-proxy-setup-ca: gnunet-gns-proxy-setup-ca.in Makefile |
110 | $(do_subst) < $(srcdir)/gnunet-gns-proxy-setup-ca.in > gnunet-gns-proxy-setup-ca | 107 | $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/gnunet-gns-proxy-setup-ca.in > gnunet-gns-proxy-setup-ca |
111 | @chmod +x gnunet-gns-proxy-setup-ca | 108 | @chmod +x gnunet-gns-proxy-setup-ca |
112 | 109 | ||
113 | do_subst_pkgdatadir = $(SED) -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' | ||
114 | |||
115 | test_gnunet_gns.sh: test_gnunet_gns.sh.in Makefile | 110 | test_gnunet_gns.sh: test_gnunet_gns.sh.in Makefile |
116 | $(do_subst_pkgdatadir) < $(srcdir)/test_gnunet_gns.sh.in > test_gnunet_gns.sh | 111 | $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_gnunet_gns.sh.in > test_gnunet_gns.sh |
117 | @chmod +x test_gnunet_gns.sh | 112 | @chmod +x test_gnunet_gns.sh |
118 | 113 | ||
119 | CLEANFILES = test_gnunet_gns.sh | 114 | CLEANFILES = test_gnunet_gns.sh |
diff --git a/src/gns/gnunet-gns-proxy-setup-ca.in b/src/gns/gnunet-gns-proxy-setup-ca.in index 7a79c7994..602aadb2a 100644 --- a/src/gns/gnunet-gns-proxy-setup-ca.in +++ b/src/gns/gnunet-gns-proxy-setup-ca.in | |||
@@ -48,30 +48,30 @@ | |||
48 | 48 | ||
49 | dir=$(dirname "$0") | 49 | dir=$(dirname "$0") |
50 | 50 | ||
51 | if test -e @pkgdatadir@/progname.sh | 51 | if test -e @PKGDATADIRECTORY@/progname.sh |
52 | then | 52 | then |
53 | . @pkgdatadir@/progname.sh | 53 | . @PKGDATADIRECTORY@/progname.sh |
54 | else | 54 | else |
55 | . $dir/../../contrib/build-common/sh/lib.sh/progname.sh | 55 | . $dir/../../contrib/build-common/sh/lib.sh/progname.sh |
56 | fi | 56 | fi |
57 | 57 | ||
58 | if test -e @pkgdatadir@/existence.sh | 58 | if test -e @PKGDATADIRECTORY@/existence.sh |
59 | then | 59 | then |
60 | . @pkgdatadir@/existence.sh | 60 | . @PKGDATADIRECTORY@/existence.sh |
61 | else | 61 | else |
62 | . $dir/../../contrib/build-common/sh/lib.sh/existence.sh | 62 | . $dir/../../contrib/build-common/sh/lib.sh/existence.sh |
63 | fi | 63 | fi |
64 | 64 | ||
65 | if test -e @pkgdatadir@/msg.sh | 65 | if test -e @PKGDATADIRECTORY@/msg.sh |
66 | then | 66 | then |
67 | . @pkgdatadir@/msg.sh | 67 | . @PKGDATADIRECTORY@/msg.sh |
68 | else | 68 | else |
69 | . $dir/../../contrib/build-common/sh/lib.sh/msg.sh | 69 | . $dir/../../contrib/build-common/sh/lib.sh/msg.sh |
70 | fi | 70 | fi |
71 | 71 | ||
72 | if test -e @pkgdatadir@/version_gnunet.sh | 72 | if test -e @PKGDATADIRECTORY@/version_gnunet.sh |
73 | then | 73 | then |
74 | . @pkgdatadir@/version_gnunet.sh | 74 | . @PKGDATADIRECTORY@/version_gnunet.sh |
75 | else | 75 | else |
76 | . $dir/../../contrib/build-common/sh/lib.sh/version_gnunet.sh | 76 | . $dir/../../contrib/build-common/sh/lib.sh/version_gnunet.sh |
77 | fi | 77 | fi |
@@ -143,8 +143,8 @@ generate_ca() | |||
143 | 143 | ||
144 | # ------------- openssl | 144 | # ------------- openssl |
145 | 145 | ||
146 | GNUTLS_CA_TEMPLATE=@pkgdatadir@/gnunet-gns-proxy-ca.template | 146 | GNUTLS_CA_TEMPLATE=@PKGDATADIRECTORY@/gnunet-gns-proxy-ca.template |
147 | OPENSSLCFG=@pkgdatadir@/openssl.cnf | 147 | OPENSSLCFG=@PKGDATADIRECTORY@/openssl.cnf |
148 | CERTTOOL="" | 148 | CERTTOOL="" |
149 | OPENSSL=0 | 149 | OPENSSL=0 |
150 | if test -x $(existence gnunet-certtool) | 150 | if test -x $(existence gnunet-certtool) |
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 @@ | |||
8 | # but this works for now. | 8 | # but this works for now. |
9 | dir=$(dirname "$0") | 9 | dir=$(dirname "$0") |
10 | 10 | ||
11 | if test -e @pkgdatadir@/existence.sh | 11 | if test -e @PKGDATADIRECTORY@/existence.sh |
12 | then | 12 | then |
13 | . @pkgdatadir@/existence.sh | 13 | . @PKGDATADIRECTORY@/existence.sh |
14 | else | 14 | else |
15 | . $dir/../../contrib/build-common/sh/lib.sh/existence.sh | 15 | . $dir/../../contrib/build-common/sh/lib.sh/existence.sh |
16 | fi | 16 | fi |
@@ -22,7 +22,7 @@ fi | |||
22 | $LOCATION --version | 22 | $LOCATION --version |
23 | if test $? != 0 | 23 | if test $? != 0 |
24 | then | 24 | then |
25 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | 25 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" |
26 | exit 77 | 26 | exit 77 |
27 | fi | 27 | fi |
28 | 28 | ||