aboutsummaryrefslogtreecommitdiff
path: root/src/arm
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-12-02 15:30:56 +0000
committerng0 <ng0@n0.is>2019-12-02 15:30:56 +0000
commitc8e5e28048dd9605f7958ef95f2a6dd626658069 (patch)
tree52375a14cc93c4161a658b4c7a1926dda11d8909 /src/arm
parent53f35813d89de6f7c91883277129ffda3ca5b772 (diff)
downloadgnunet-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/arm')
-rw-r--r--src/arm/Makefile.am6
-rw-r--r--src/arm/test_gnunet_arm.py.in2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index 43e868805..8a738c5a9 100644
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -88,15 +88,13 @@ test_gnunet_service_arm_SOURCES = \
88 libgnunetarm.la \ 88 libgnunetarm.la \
89 $(top_builddir)/src/util/libgnunetutil.la 89 $(top_builddir)/src/util/libgnunetutil.la
90 90
91do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
92
93SUFFIXES = .py.in .py 91SUFFIXES = .py.in .py
94.py.in.py: 92.py.in.py:
95 $(do_subst) < $(srcdir)/$< > $@ 93 $(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)/$< > $@
96 chmod +x $@ 94 chmod +x $@
97 95
98test_gnunet_arm.py: test_gnunet_arm.py.in Makefile 96test_gnunet_arm.py: test_gnunet_arm.py.in Makefile
99 $(do_subst) < $(srcdir)/test_gnunet_arm.py.in > test_gnunet_arm.py 97 $(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_arm.py.in > test_gnunet_arm.py
100 chmod +x test_gnunet_arm.py 98 chmod +x test_gnunet_arm.py
101 99
102EXTRA_DIST = \ 100EXTRA_DIST = \
diff --git a/src/arm/test_gnunet_arm.py.in b/src/arm/test_gnunet_arm.py.in
index 9605c4eae..e657d4a3f 100644
--- a/src/arm/test_gnunet_arm.py.in
+++ b/src/arm/test_gnunet_arm.py.in
@@ -1,4 +1,4 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2 2
3import os 3import os
4import sys 4import sys