X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2FMakefile.local;h=04913a06bf61387204d8bbd00feb88ddd25fa072;hb=3d0fd40eb0eca54fd05460203ae754c63f633d69;hp=040e64d435724b450008260e9351e52b3551fdfe;hpb=ab022657776af0bb47e72caf2517464ca59e7d48;p=notmuch diff --git a/emacs/Makefile.local b/emacs/Makefile.local index 040e64d4..04913a06 100644 --- a/emacs/Makefile.local +++ b/emacs/Makefile.local @@ -45,6 +45,10 @@ emacs_images := \ $(srcdir)/$(dir)/notmuch-logo.png emacs_bytecode = $(emacs_sources:.el=.elc) +emacs_docstrings = $(emacs_sources:.el=.rsti) + +docstring.stamp: ${emacs_docstrings} + touch $@ # Because of defmacro's and defsubst's, we have to account for load # dependencies between Elisp files when byte compiling. Otherwise, @@ -76,19 +80,26 @@ CLEAN+=$(dir)/.eldeps $(dir)/.eldeps.tmp $(dir)/.eldeps.x ifeq ($(HAVE_EMACS),1) %.elc: %.el $(global_deps) $(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $< +%.rsti: %.el + $(call quiet,EMACS) -batch -L emacs -l rstdoc -f rstdoc-batch-extract $< $@ 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 ifeq ($(WITH_EMACS),1) ifeq ($(HAVE_EMACS),1) -all: $(emacs_bytecode) +all: $(emacs_bytecode) $(emacs_docstrings) install-emacs: $(emacs_bytecode) endif @@ -105,11 +116,15 @@ endif mkdir -p "$(DESTDIR)$(emacsetcdir)" install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)" mkdir -p "$(DESTDIR)$(prefix)/bin/" - install $(emacs_mua) "$(DESTDIR)$(prefix)/bin" +ifeq ($(HAVE_BASH),1) + sed "1s|^#!.*|#! $(BASH_ABSOLUTE)|" < $(emacs_mua) > $(DESTDIR)$(prefix)/bin/notmuch-emacs-mua + chmod 755 $(DESTDIR)$(prefix)/bin/notmuch-emacs-mua +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 +CLEAN := $(CLEAN) $(emacs_bytecode) $(dir)/notmuch-version.el $(dir)/notmuch-pkg.el \ + $(emacs_docstrings) docstring.stamp