From: David Bremner <david@tethera.net>
Date: Mon, 21 May 2018 20:08:52 +0000 (-0700)
Subject: doc: install info files in elpa package
X-Git-Tag: 0.27_rc0~9
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=95f441b06bbf728252fe6cd3f8cb93d969011425

doc: install info files in elpa package

The duplication of effort in installing into different places seems
unavoidable; or more precisely not worth avoiding by more extensive
gnu-make-isms.
---

diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index 040e64d4..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