diff options
author | ng0 <ng0@n0.is> | 2019-12-01 19:33:04 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-12-01 19:33:04 +0000 |
commit | 24d9ece906cc03e80db617168c9a2d93409e4640 (patch) | |
tree | ec55849eb22cf0131d1f73185884da605824130c /contrib | |
parent | 492a887121d7ddd5aa35450cf35cfd0fc3b5d239 (diff) | |
download | gnunet-24d9ece906cc03e80db617168c9a2d93409e4640.tar.gz gnunet-24d9ece906cc03e80db617168c9a2d93409e4640.zip |
Add --with-gnunet-logread to configure.
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/scripts/gnunet-logread/Makefile.am | 12 | ||||
-rwxr-xr-x | contrib/scripts/gnunet-logread/gnunet-logread.in | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/contrib/scripts/gnunet-logread/Makefile.am b/contrib/scripts/gnunet-logread/Makefile.am index 790b58fea..e1183a885 100644 --- a/contrib/scripts/gnunet-logread/Makefile.am +++ b/contrib/scripts/gnunet-logread/Makefile.am | |||
@@ -1,7 +1,7 @@ | |||
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 py="$(PERL)" '{gsub("@PERLEXE@",py); print $$0}' | 4 | do_subst = $(AWK) -v prl="$(PERL)" -v pfx="$(prefix)" '{if (/@SUBSTPREFIX@/) { gsub("@SUBSTPREFIX@",pfx)}; gsub("@PERLEXE@",prl); print $$0}' |
5 | 5 | ||
6 | SUFFIXES = .in | 6 | SUFFIXES = .in |
7 | 7 | ||
@@ -17,9 +17,15 @@ CLEANFILES= \ | |||
17 | gnunet-logread \ | 17 | gnunet-logread \ |
18 | gnunet-logread-ipc-sdedit | 18 | gnunet-logread-ipc-sdedit |
19 | 19 | ||
20 | if GNUNET_LOGREAD | ||
21 | bin_SCRIPTS = \ | ||
22 | gnunet-logread-ipc \ | ||
23 | $(CLEANFILES) | ||
24 | else | ||
20 | noinst_SCRIPTS = \ | 25 | noinst_SCRIPTS = \ |
21 | $(CLEANFILES) \ | 26 | gnunet-logread-ipc \ |
22 | gnunet-logread-ipc | 27 | $(CLEANFILES) |
28 | endif | ||
23 | 29 | ||
24 | EXTRA_DIST = \ | 30 | EXTRA_DIST = \ |
25 | gnunet-logread.in \ | 31 | gnunet-logread.in \ |
diff --git a/contrib/scripts/gnunet-logread/gnunet-logread.in b/contrib/scripts/gnunet-logread/gnunet-logread.in index e27c1d3fc..ce588b8e6 100755 --- a/contrib/scripts/gnunet-logread/gnunet-logread.in +++ b/contrib/scripts/gnunet-logread/gnunet-logread.in | |||
@@ -29,7 +29,7 @@ my %levels = ( NONE => 0, ERROR => 1, WARNING => 2, INFO => 4, DEBUG => 8 ); | |||
29 | 29 | ||
30 | # Message type numbers to names | 30 | # Message type numbers to names |
31 | my %msgtypes; | 31 | my %msgtypes; |
32 | my $prefix = $ENV{GNUNET_PREFIX} || '/usr'; | 32 | my $prefix = $ENV{GNUNET_PREFIX} || '@SUBSTPREFIX@'; |
33 | my $filename = "$prefix/include/gnunet/gnunet_protocols.h"; | 33 | my $filename = "$prefix/include/gnunet/gnunet_protocols.h"; |
34 | $ipc = $opts{s} || $DEFAULT_SOCKET; | 34 | $ipc = $opts{s} || $DEFAULT_SOCKET; |
35 | 35 | ||