Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / contrib / Makefile.am

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 7d1bfb8aba7dbd5031c3681c8e10141204f8e2f3..3f11977b044f4bc278cc3d9e7295c4a949176286 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
 tap32dir = $(pkgdatadir)/openvpn-tap32/tapw32/
@@ -44,6 +45,8 @@ tap64_DATA = \
 endif
 
 EXTRA_DIST = \
+ no_forcestart.conf \
+ no_autostart_above_core.conf \
  coverage.sh \
  report.sh \
  terminate.py.in \
@@ -61,6 +64,9 @@ EXTRA_DIST = \
  openvpn-tap32/tap32-signed-i386-2.1.zip \
  openvpn-tap32/tap32-source-2.1.zip
 
+CLEANFILES = \
+  $(noinst_SCRIPTS)
+
 do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 
 %.py: %.py.in Makefile
@@ -80,6 +86,7 @@ check_PROGRAMS = \
  test_gnunet_prefix
 
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif