From: Jani Nikula <jani@nikula.org>
Date: Mon, 21 Nov 2016 21:13:38 +0000 (+0200)
Subject: notmuch.desktop: move under emacs as notmuch-emacs-mua.desktop
X-Git-Tag: 0.24_rc0~69
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=66c1bff416c23634a6cec937e386a6830c5c0bc2;hp=440d24e7cccd2699d9cfdcb57c90aaf759da7832

notmuch.desktop: move under emacs as notmuch-emacs-mua.desktop

The notmuch.desktop file is part of notmuch-emacs. Move it under
emacs, and rename as notmuch-emacs-mua.desktop to reflect this.
---

diff --git a/Makefile.local b/Makefile.local
index 22208235..3548ed96 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -274,11 +274,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 6408c02c..b118c67d 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -39,6 +39,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
@@ -106,4 +107,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/emacs/notmuch-emacs-mua.desktop b/emacs/notmuch-emacs-mua.desktop
new file mode 100644
index 00000000..f1600473
--- /dev/null
+++ b/emacs/notmuch-emacs-mua.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Notmuch (emacs interface)
+Exec=emacs -f notmuch
+Icon=emblem-mail
+Terminal=false
+Type=Application
+Categories=Network;Email;
diff --git a/notmuch.desktop b/notmuch.desktop
deleted file mode 100644
index f1600473..00000000
--- a/notmuch.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Notmuch (emacs interface)
-Exec=emacs -f notmuch
-Icon=emblem-mail
-Terminal=false
-Type=Application
-Categories=Network;Email;