psyc/social: local join flag; social service: leave place, save _file

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

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index e3ff5068e9b054824d3146133c7535982bdef574..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 \
@@ -83,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