summary refs log tree commit diff
path: root/Makefile.am
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-05-17 15:41:56 +0200
committerLudovic Courtès <ludo@gnu.org>2014-05-17 16:23:01 +0200
commit14af289ed9828850ceb341679e42aaa5db7912ee (patch)
tree9c1709425aba494d5b7f79c1f322ade61bbfc4be /Makefile.am
parent1634c0420e5e8e609f5d52f5bf92eeafff5bfb6a (diff)
downloadguix-14af289ed9828850ceb341679e42aaa5db7912ee.tar.gz
build: Add --with-libgcrypt-libdir=DIR to support Debian's multi-arch layout.
* configure.ac: Remove 'LIBGCRYPT_PREFIX' and use 'LIBGCRYPT_LIBDIR'
  instead.  Add --with-libgcrypt-libdir=DIR option.
* Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Pass
  '--with-libgcrypt-libdir'.
* config-daemon.ac: Honor $LIBGCRYPT_LIBDIR when computing
  LIBGCRYPT_LIBS.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index a08215ef1e..84f8eb1b63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -259,6 +259,7 @@ endif BUILD_DAEMON
 ACLOCAL_AMFLAGS = -I m4
 AM_DISTCHECK_CONFIGURE_FLAGS =			\
   --with-libgcrypt-prefix="$(LIBGCRYPT_PREFIX)"	\
+  --with-libgcrypt-libdir="$(LIBGCRYPT_LIBDIR)"	\
   --with-nix-prefix="$(NIX_PREFIX)"		\
   --enable-daemon