-fix crash observed on FreeBSD

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

diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index af3b96655f8ceefe6027f580dee8b237c3f6d4f8..d5219cae9f57ed7cb4fe6064d15067a0d7f9bcda 100644 (file)
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -94,7 +94,7 @@ libexec_PROGRAMS += \
   $(AUDIO_HELPER_RECD) \
   $(AUDIO_HELPER_PLAY)
 
-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;
 TESTS = $(AUDIO_TESTS)
 
 if BUILD_PULSE_HELPERS
@@ -147,7 +147,7 @@ gnunet_service_conversation_LDADD = \
   libgnunetconversation.la \
   libgnunetspeaker.la \
   libgnunetmicrophone.la \
-  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(top_builddir)/src/cadet/libgnunetcadet.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(INTLLIBS)
 gnunet_service_conversation_LDFLAGS = \