X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2FMakefile.local;h=1b3ef5847a4060a0bb4503356d90caf1a11a9d18;hb=ccb52edb4c9fecd65a5a2577b6d1e96c4b8de492;hp=2cfa77ffd0dddf98ccdca1319c346fc01a472994;hpb=459989b7efb109e31930da5db0112854fa6e03da;p=notmuch

diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index 2cfa77ff..1b3ef584 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -80,9 +80,14 @@ endif
 
 elpa: $(ELPA_FILE)
 
-notmuch-emacs-%.tar: ${elpa_sources}
+ELPA_DIR=.elpa-build/notmuch-${ELPA_VERSION}
+notmuch-emacs-%.tar: ${elpa_sources} build-info
 	mkdir -p .elpa-build/notmuch-${ELPA_VERSION}
-	cp ${elpa_sources} .elpa-build/notmuch-${ELPA_VERSION}
+	cp ${elpa_sources} ${ELPA_DIR}
+ifeq ($(HAVE_SPHINX)$(HAVE_MAKEINFO)$(HAVE_INSTALL_INFO),111)
+	cp ${INFO_INFO_FILES} ${ELPA_DIR}
+	for file in ${INFO_INFO_FILES}; do install-info $$file ${ELPA_DIR}/dir; done
+endif
 	tar -C .elpa-build -cf $@ notmuch-${ELPA_VERSION}
 	rm -r .elpa-build
 
@@ -109,6 +114,7 @@ endif
 ifeq ($(WITH_DESKTOP),1)
 	mkdir -p "$(DESTDIR)$(desktop_dir)"
 	desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" $(emacs_mua_desktop)
+	-update-desktop-database "$(DESTDIR)$(desktop_dir)"
 endif
 
 CLEAN := $(CLEAN) $(emacs_bytecode) $(dir)/notmuch-version.el $(dir)/notmuch-pkg.el