diff options
author | ng0 <ng0@n0.is> | 2019-12-12 00:11:02 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-12-12 00:11:02 +0000 |
commit | 569d3ef34792ed8abc40f3e0ba87db8cac28b76f (patch) | |
tree | cd518485ad69c0f4c787780eceefc9f0ba2bec55 /contrib/scripts | |
parent | 1fc982c458e3d3b55556a67cc034c2cb5e07b38d (diff) | |
download | gnunet-569d3ef34792ed8abc40f3e0ba87db8cac28b76f.tar.gz gnunet-569d3ef34792ed8abc40f3e0ba87db8cac28b76f.zip |
contrib/scripts and gnunet-logread: reduce code used for output.
Diffstat (limited to 'contrib/scripts')
-rw-r--r-- | contrib/scripts/Makefile.am | 4 | ||||
-rw-r--r-- | contrib/scripts/gnunet-logread/Makefile.am | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/contrib/scripts/Makefile.am b/contrib/scripts/Makefile.am index f8b7ec3d1..bbb9e6d67 100644 --- a/contrib/scripts/Makefile.am +++ b/contrib/scripts/Makefile.am | |||
@@ -52,11 +52,11 @@ CLEANFILES = \ | |||
52 | SUFFIXES = .py.in .py | 52 | SUFFIXES = .py.in .py |
53 | 53 | ||
54 | .py.in.py: | 54 | .py.in.py: |
55 | $(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 < $< > $@ | 55 | $(AWK) -v py="$(PYTHON)" -f $(top_srcdir)/bin/dosubst.awk < $< > $@ |
56 | chmod +x $@ | 56 | chmod +x $@ |
57 | 57 | ||
58 | if HAVE_AWK | 58 | if HAVE_AWK |
59 | check-texinfo.awk: check-texinfo.awk.in Makefile | 59 | check-texinfo.awk: check-texinfo.awk.in Makefile |
60 | $(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)/check-texinfo.awk.in > check-texinfo.awk | 60 | $(AWK) -v awkay="$(AWK_BINARY)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/check-texinfo.awk.in > check-texinfo.awk |
61 | chmod +x check-texinfo.awk | 61 | chmod +x check-texinfo.awk |
62 | endif | 62 | endif |
diff --git a/contrib/scripts/gnunet-logread/Makefile.am b/contrib/scripts/gnunet-logread/Makefile.am index aa92dfe16..d0054391c 100644 --- a/contrib/scripts/gnunet-logread/Makefile.am +++ b/contrib/scripts/gnunet-logread/Makefile.am | |||
@@ -1,16 +1,14 @@ | |||
1 | # This Makefile.am is in the public domain | 1 | # This Makefile.am is in the public domain |
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include | 2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include |
3 | 3 | ||
4 | do_subst = $(AWK) -v prl="$(PERL)" -v pfx="$(prefix)" '{if (/@SUBSTPREFIX@/) { gsub("@SUBSTPREFIX@",pfx)}; gsub("@PERLEXE@",prl); print $$0}' | ||
5 | |||
6 | SUFFIXES = .in | 4 | SUFFIXES = .in |
7 | 5 | ||
8 | gnunet-logread: gnunet-logread.in Makefile | 6 | gnunet-logread: gnunet-logread.in Makefile |
9 | $(do_subst) < $(srcdir)/gnunet-logread.in > gnunet-logread | 7 | $(AWK) -v prl="$(PERL)" -v pfx="$(prefix)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/gnunet-logread.in > gnunet-logread |
10 | chmod +x gnunet-logread | 8 | chmod +x gnunet-logread |
11 | 9 | ||
12 | gnunet-logread-ipc-sdedit: gnunet-logread-ipc-sdedit.in Makefile | 10 | gnunet-logread-ipc-sdedit: gnunet-logread-ipc-sdedit.in Makefile |
13 | $(do_subst) < $(srcdir)/gnunet-logread-ipc-sdedit.in > gnunet-logread-ipc-sdedit | 11 | $(AWK) -v prl="$(PERL)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/gnunet-logread-ipc-sdedit.in > gnunet-logread-ipc-sdedit |
14 | chmod +x gnunet-logread-ipc-sdedit | 12 | chmod +x gnunet-logread-ipc-sdedit |
15 | 13 | ||
16 | CLEANFILES= \ | 14 | CLEANFILES= \ |