X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=debian%2Frules;h=ebd1048170839dfc90aa75c789b1669af252bee2;hp=56378ecd66827c6c1391c7e9011319153352c341;hb=8de94981677e57343b7b2dfc9e1036730ce708fc;hpb=c5ef2dc448659110adc8ab324ae166683d21988f

diff --git a/debian/rules b/debian/rules
index 56378ecd..ebd10481 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,24 +2,25 @@
 
 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
 	dh_auto_build --sourcedirectory bindings/python
 	cd bindings/python && $(python3_all) setup.py build
-	cd bindings/ruby && ruby extconf.rb --vendor && make
 	$(MAKE) -C contrib/notmuch-mutt
 
 override_dh_auto_clean:
@@ -33,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