spell out message types more, use correct conversion direction

[oweals/gnunet.git] / src / tun / Makefile.am

diff --git a/src/tun/Makefile.am b/src/tun/Makefile.am
index a27d192cba5a3241d69dc0360ec571e2f59b3b76..c741f5654d4de97cb038d5551e3c004c17b1d646 100644 (file)
--- a/src/tun/Makefile.am
+++ b/src/tun/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
@@ -27,7 +28,7 @@ check_PROGRAMS = \
  test_regex
 
 if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 
@@ -35,11 +36,11 @@ test_tun_SOURCES = \
  test_tun.c
 test_tun_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/tun/libgnunettun.la
+ libgnunettun.la
 
 
 test_regex_SOURCES = \
  test_regex.c
 test_regex_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/tun/libgnunettun.la
+ libgnunettun.la