X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=debian%2Frules;h=ebd1048170839dfc90aa75c789b1669af252bee2;hp=04f0062a53ab992eb8f0f927a7644ab1a48d128a;hb=60ddce8a161772583e8d223498997ee866d04ede;hpb=8cca886b10c5ec44f3214701c0c1e3c896d53d5c

diff --git a/debian/rules b/debian/rules
index 04f0062a..ebd10481 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,18 +2,20 @@
 
 python3_all = py3versions -s | xargs -n1 | xargs -t -I {} env {}
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 %:
-	dh $@ --with python2,python3
+	dh $@ --with python2,python3,elpa
 
 override_dh_auto_configure:
-	./configure --prefix=/usr \
+	BASHCMD=/bin/bash ./configure --prefix=/usr \
 		--libdir=/usr/lib/$$(dpkg-architecture -q DEB_TARGET_MULTIARCH) \
 		--includedir=/usr/include \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--emacslispdir=/usr/share/emacs/site-lisp/notmuch
+		--zshcompletiondir=/usr/share/zsh/vendor-completions \
+		--localstatedir=/var
 
 override_dh_auto_build:
 	dh_auto_build -- V=1
@@ -32,7 +34,5 @@ override_dh_auto_install:
 	dh_auto_install
 	dh_auto_install --sourcedirectory bindings/python
 	cd bindings/python && $(python3_all) setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp
+	$(MAKE) -C contrib/notmuch-mutt DESTDIR=$(CURDIR)/debian/tmp install
 	dh_auto_install --sourcedirectory bindings/ruby
-
-override_dh_strip:
-	dh_strip --dbg-package notmuch-dbg