From 66c1bff416c23634a6cec937e386a6830c5c0bc2 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Mon, 21 Nov 2016 23:13:38 +0200 Subject: [PATCH 1/1] 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. --- 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 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/notmuch.desktop b/emacs/notmuch-emacs-mua.desktop similarity index 100% rename from notmuch.desktop rename to emacs/notmuch-emacs-mua.desktop -- 2.43.0