From 569d3ef34792ed8abc40f3e0ba87db8cac28b76f Mon Sep 17 00:00:00 2001 From: ng0 Date: Thu, 12 Dec 2019 00:11:02 +0000 Subject: [PATCH] contrib/scripts and gnunet-logread: reduce code used for output. --- contrib/scripts/Makefile.am | 4 ++-- 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 = \ SUFFIXES = .py.in .py .py.in.py: - $(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 < $< > $@ + $(AWK) -v py="$(PYTHON)" -f $(top_srcdir)/bin/dosubst.awk < $< > $@ chmod +x $@ if HAVE_AWK check-texinfo.awk: check-texinfo.awk.in Makefile - $(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 + $(AWK) -v awkay="$(AWK_BINARY)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/check-texinfo.awk.in > check-texinfo.awk chmod +x check-texinfo.awk 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 @@ # This Makefile.am is in the public domain AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include -do_subst = $(AWK) -v prl="$(PERL)" -v pfx="$(prefix)" '{if (/@SUBSTPREFIX@/) { gsub("@SUBSTPREFIX@",pfx)}; gsub("@PERLEXE@",prl); print $$0}' - SUFFIXES = .in gnunet-logread: gnunet-logread.in Makefile - $(do_subst) < $(srcdir)/gnunet-logread.in > gnunet-logread + $(AWK) -v prl="$(PERL)" -v pfx="$(prefix)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/gnunet-logread.in > gnunet-logread chmod +x gnunet-logread gnunet-logread-ipc-sdedit: gnunet-logread-ipc-sdedit.in Makefile - $(do_subst) < $(srcdir)/gnunet-logread-ipc-sdedit.in > gnunet-logread-ipc-sdedit + $(AWK) -v prl="$(PERL)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/gnunet-logread-ipc-sdedit.in > gnunet-logread-ipc-sdedit chmod +x gnunet-logread-ipc-sdedit CLEANFILES= \ -- 2.25.1