aboutsummaryrefslogtreecommitdiff
path: root/src/fs
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-12-02 17:34:07 +0000
committerng0 <ng0@n0.is>2019-12-02 17:34:07 +0000
commit339d7a7d8ca789f9777501c3092e5c7ea0c4850a (patch)
tree5110bf9188f3c0c6d102cd4bf45d2325a5ff4136 /src/fs
parent79ff68acae7e4774881d6bc53fc5c639da4a2e7b (diff)
parentfdf8c95a33fe6c81c93cd17ed7a38b8b55df7d54 (diff)
downloadgnunet-netbsd-support.tar.gz
gnunet-netbsd-support.zip
Merge branch 'master' into netbsd-supportnetbsd-support
Diffstat (limited to 'src/fs')
-rw-r--r--src/fs/Makefile.am10
-rwxr-xr-xsrc/fs/test_gnunet_fs_idx.py.in2
-rwxr-xr-xsrc/fs/test_gnunet_fs_psd.py.in2
-rwxr-xr-xsrc/fs/test_gnunet_fs_rec.py.in2
4 files changed, 7 insertions, 9 deletions
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index f0efefc4b..b1555be60 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -525,22 +525,20 @@ perf_gnunet_service_fs_p2p_respect_LDADD = \
525 $(top_builddir)/src/util/libgnunetutil.la 525 $(top_builddir)/src/util/libgnunetutil.la
526 526
527 527
528do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
529
530test_gnunet_fs_psd.py: test_gnunet_fs_psd.py.in Makefile 528test_gnunet_fs_psd.py: test_gnunet_fs_psd.py.in Makefile
531 $(do_subst) < $(srcdir)/test_gnunet_fs_psd.py.in > test_gnunet_fs_psd.py 529 $(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_fs_psd.py.in > test_gnunet_fs_psd.py
532 chmod +x test_gnunet_fs_psd.py 530 chmod +x test_gnunet_fs_psd.py
533 531
534test_gnunet_fs_rec.py: test_gnunet_fs_rec.py.in Makefile 532test_gnunet_fs_rec.py: test_gnunet_fs_rec.py.in Makefile
535 $(do_subst) < $(srcdir)/test_gnunet_fs_rec.py.in > test_gnunet_fs_rec.py 533 $(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_fs_rec.py.in > test_gnunet_fs_rec.py
536 chmod +x test_gnunet_fs_rec.py 534 chmod +x test_gnunet_fs_rec.py
537 535
538test_gnunet_fs_ns.py: test_gnunet_fs_ns.py.in Makefile 536test_gnunet_fs_ns.py: test_gnunet_fs_ns.py.in Makefile
539 $(do_subst) < $(srcdir)/test_gnunet_fs_ns.py.in > test_gnunet_fs_ns.py 537 $(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_fs_ns.py.in > test_gnunet_fs_ns.py
540 chmod +x test_gnunet_fs_ns.py 538 chmod +x test_gnunet_fs_ns.py
541 539
542test_gnunet_fs_idx.py: test_gnunet_fs_idx.py.in Makefile 540test_gnunet_fs_idx.py: test_gnunet_fs_idx.py.in Makefile
543 $(do_subst) < $(srcdir)/test_gnunet_fs_idx.py.in > test_gnunet_fs_idx.py 541 $(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_fs_idx.py.in > test_gnunet_fs_idx.py
544 chmod +x test_gnunet_fs_idx.py 542 chmod +x test_gnunet_fs_idx.py
545 543
546 544
diff --git a/src/fs/test_gnunet_fs_idx.py.in b/src/fs/test_gnunet_fs_idx.py.in
index 2c8c7e8ec..564dd68f2 100755
--- a/src/fs/test_gnunet_fs_idx.py.in
+++ b/src/fs/test_gnunet_fs_idx.py.in
@@ -1,4 +1,4 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2# This file is part of GNUnet. 2# This file is part of GNUnet.
3# (C) 2010 Christian Grothoff (and other contributing authors) 3# (C) 2010 Christian Grothoff (and other contributing authors)
4# 4#
diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in
index abb3d0b83..a25e4eaef 100755
--- a/src/fs/test_gnunet_fs_psd.py.in
+++ b/src/fs/test_gnunet_fs_psd.py.in
@@ -1,4 +1,4 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2# This file is part of GNUnet. 2# This file is part of GNUnet.
3# (C) 2010, 2018 Christian Grothoff (and other contributing authors) 3# (C) 2010, 2018 Christian Grothoff (and other contributing authors)
4# 4#
diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in
index f827aa3a5..f7e84e3da 100755
--- a/src/fs/test_gnunet_fs_rec.py.in
+++ b/src/fs/test_gnunet_fs_rec.py.in
@@ -1,4 +1,4 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2# This file is part of GNUnet. 2# This file is part of GNUnet.
3# (C) 2010 Christian Grothoff (and other contributing authors) 3# (C) 2010 Christian Grothoff (and other contributing authors)
4# 4#