The notmuch.desktop file is part of notmuch-emacs. Move it under
emacs, and rename as notmuch-emacs-mua.desktop to reflect this.
---
 Makefile.local                                     | 5 -----
 emacs/Makefile.local                               | 6 ++++++
 notmuch.desktop => emacs/notmuch-emacs-mua.desktop | 0
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename notmuch.desktop => emacs/notmuch-emacs-mua.desktop (100%)

diff --git a/Makefile.local b/Makefile.local
index 0a122ab0e208..f90a97c4a6b7 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -336,11 +336,6 @@ ifeq ($(WITH_EMACS), 1)
 endif
 endif
 
-.PHONY: install-desktop
-install-desktop:
-       mkdir -p "$(DESTDIR)$(desktop_dir)"
-       desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" 
notmuch.desktop
-
 SRCS  := $(SRCS) $(notmuch_client_srcs)
 CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules)
 CLEAN := $(CLEAN) version.stamp notmuch-*.tar.gz.tmp
diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index 8ab7b1260924..b47577ac1110 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -37,6 +37,7 @@ all: $(dir)/notmuch-pkg.el
 install-emacs: $(dir)/notmuch-pkg.el
 
 emacs_mua := $(dir)/notmuch-emacs-mua
+emacs_mua_desktop := $(dir)/notmuch-emacs-mua.desktop
 
 emacs_images := \
        $(srcdir)/$(dir)/notmuch-logo.png
@@ -96,4 +97,9 @@ endif
        mkdir -p "$(DESTDIR)$(prefix)/bin/"
        install $(emacs_mua) "$(DESTDIR)$(prefix)/bin"
 
+.PHONY: install-desktop
+install-desktop:
+       mkdir -p "$(DESTDIR)$(desktop_dir)"
+       desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" 
$(emacs_mua_desktop)
+
 CLEAN := $(CLEAN) $(emacs_bytecode) $(dir)/notmuch-version.el 
$(dir)/notmuch-pkg.el
diff --git a/notmuch.desktop b/emacs/notmuch-emacs-mua.desktop
similarity index 100%
rename from notmuch.desktop
rename to emacs/notmuch-emacs-mua.desktop
-- 
2.1.4

_______________________________________________
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

Reply via email to