fix #3284: support lib/MULTIARCH/ paths in installation, use GNUNET_PREFIX=@libdir...

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

diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am
index 11a9373786148678ff2073e0ba81381875e687e3..010d7ebfa79eec385cb1db14aaf94b0e0440667d 100644 (file)
--- a/src/scalarproduct/Makefile.am
+++ b/src/scalarproduct/Makefile.am
@@ -29,6 +29,7 @@ gnunet_scalarproduct_SOURCES = \
 gnunet_scalarproduct_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \
+  $(LIBGCRYPT_LIBS) \
   -lgcrypt \
   $(GN_LIBINTL)
 gnunet_scalarproduct_DEPENDENCIES = \
@@ -40,6 +41,7 @@ gnunet_service_scalarproduct_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/mesh/libgnunetmesh.la \
   $(top_builddir)/src/set/libgnunetset.la \
+  $(LIBGCRYPT_LIBS) \
   -lgcrypt \
   $(GN_LIBINTL)
 
@@ -49,6 +51,7 @@ libgnunetscalarproduct_la_SOURCES = \
 libgnunetscalarproduct_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(LIBGCRYPT_LIBS) \
   -lgcrypt \
   $(LTLIBINTL)
 libgnunetscalarproduct_la_LDFLAGS = \
@@ -64,5 +67,6 @@ check_SCRIPTS = \
   test_scalarproduct_negativezero.sh
 
 if ENABLE_TEST_RUN
+  TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH;
   TESTS = $(check_SCRIPTS)
 endif