summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorStef Walter <stefw@collabora.co.uk>2011-10-24 08:50:00 +0200
committerStef Walter <stefw@collabora.co.uk>2011-10-24 08:50:00 +0200
commit471f694e6b08ce8b79e9ce9a53f780485c9ddf19 (patch)
tree9dd9922f343c4bdd683cf4fc6897a4f350ec7a69 /Makefile.am
parent54be47350e65735cf4c68e23b7f5033fc639a3da (diff)
parentbc01094411d724470ebda56d4515f45760f8d008 (diff)
Merge branch 'gnome-3-2'
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index bc893538..a843ca47 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
if WITH_PAM
PAM_DIR = pam
else
@@ -31,7 +33,9 @@ DISTCHECK_CONFIGURE_FLAGS = \
--enable-strict \
--disable-coverage \
--disable-update-mime \
- --with-pkcs11-modules=$(abs_srcdir)/$(top_distdir)/_inst/lib/
+ --with-pkcs11-modules=$(abs_srcdir)/$(top_distdir)/_inst/lib \
+ --with-pkcs11-config=$(abs_srcdir)/$(top_distdir)/_inst/etc/pkcs11 \
+ $(NULL)
DISTCLEANFILES = \
intltool-extract \