X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2FMakefile.local;h=5e4ae1bda257f61cac0f296ee5a9ff2bec80f4f9;hp=040e64d435724b450008260e9351e52b3551fdfe;hb=ef07e3f3bdd01a7266e0268227cd9b78f3c47c68;hpb=383796c325de2dbb32c5c02157777d2d06d39f0b diff --git a/emacs/Makefile.local b/emacs/Makefile.local index 040e64d4..5e4ae1bd 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 @@ -105,7 +110,10 @@ 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)