1 files changed, 24 insertions, 5 deletions

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index d18d06dd7..e497f3e39 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -133,10 +133,6 @@ check_PROGRAMS = \
 
 
 if HAVE_PYTHON_PEXPECT
-TEST_EXTENSIONS = .py
-PY_LOG_COMPILER = $(PYTHON)
-AM_PY_LOG_FLAGS = -v
-
 check_SCRIPTS = \
  test_gnunet_fs_psd.py \
  test_gnunet_fs_rec.py \
@@ -254,6 +250,24 @@ test_gnunet_service_fs_p2p_LDADD = \
   $(top_builddir)/src/fs/libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la  
 
+do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
+
+test_gnunet_fs_psd.py: test_gnunet_fs_psd.py.in Makefile
+        $(do_subst) < $(srcdir)/test_gnunet_fs_psd.py.in > test_gnunet_fs_psd.py
+        chmod +x test_gnunet_fs_psd.py
+
+test_gnunet_fs_rec.py: test_gnunet_fs_rec.py.in Makefile
+        $(do_subst) < $(srcdir)/test_gnunet_fs_rec.py.in > test_gnunet_fs_rec.py
+        chmod +x test_gnunet_fs_rec.py
+
+test_gnunet_fs_ns.py: test_gnunet_fs_ns.py.in Makefile
+        $(do_subst) < $(srcdir)/test_gnunet_fs_ns.py.in > test_gnunet_fs_ns.py
+        chmod +x test_gnunet_fs_ns.py
+
+test_gnunet_fs_idx.py: test_gnunet_fs_idx.py.in Makefile
+        $(do_subst) < $(srcdir)/test_gnunet_fs_idx.py.in > test_gnunet_fs_idx.py
+        chmod +x test_gnunet_fs_idx.py
+
 
 EXTRA_DIST = \
   fs_test_lib_data.conf \
@@ -273,4 +287,9 @@ EXTRA_DIST = \
   test_gnunet_fs_psd_data.conf \
   test_gnunet_fs_rec_data.conf \
   test_gnunet_fs_rec_data.tgz \
-  $(check_SCRIPTS)
+  test_gnunet_fs_psd.py.in \
+  test_gnunet_fs_rec.py.in \
+  test_gnunet_fs_ns.py.in \
+  test_gnunet_fs_idx.py.in
+
+CLEANFILES = $(check_SCRIPTS)