[PATCH] Add install target for desktop files.

[PATCH] Add install target for desktop files.

[Jeffrey C. Ollie]

Add an install target that uses desktop-file-install to install the
desktop file in the appropriate location.  The location of the install
can be modified by changing the desktop_dir variable.

Signed-off-by: Jeffrey C. Ollie <jeff@ocjtech.us>
---
 Makefile.local |    4 ++++
 configure      |    1 +
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/Makefile.local b/Makefile.local
index c87e0c4..2e7c3cd 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -45,5 +45,9 @@ install-emacs: install emacs
 	install -m0644 notmuch.el $(DESTDIR)$(emacs_lispdir)
 	install -m0644 notmuch.elc $(DESTDIR)$(emacs_lispdir)
 
+install-desktop:
+	install -d $(DESTDIR)$(desktop_dir)
+	desktop-file-install --mode 0644 --dir $(DESTDIR)$(desktop_dir) notmuch.desktop
+
 SRCS  := $(SRCS) $(notmuch_client_srcs)
 CLEAN := $(CLEAN) notmuch $(notmuch_client_modules) notmuch.elc notmuch.1.gz
diff --git a/configure b/configure
index b4770ec..1198ba7 100755
--- a/configure
+++ b/configure
@@ -132,5 +132,6 @@ EOF
 cat > Makefile.config <<EOF
 prefix = /usr/local
 bash_completion_dir = /etc/bash_completion.d
+desktop_dir = /usr/share/applications
 CFLAGS += ${have_valgrind}
 EOF
-- 
1.6.5.2

Re: [PATCH] Add install target for desktop files.

[Carl Worth]

On Sun, 22 Nov 2009 15:17:11 -0600, "Jeffrey C. Ollie" <jeff@ocjtech.us> wrote:
> Add an install target that uses desktop-file-install to install the
> desktop file in the appropriate location.  The location of the install
> can be modified by changing the desktop_dir variable.

Hi Jeffrey,

I suppose if we're going to have a .desktop file it only makes sense to
install it. A couple of questions:

> +install-desktop:
> +	install -d $(DESTDIR)$(desktop_dir)
> +	desktop-file-install --mode 0644 --dir $(DESTDIR)$(desktop_dir) notmuch.desktop

What does desktop-file-install do for us here? Anything that we couldn't
do with just "install"? I'm just wanting to be careful that we don't
break "make install" for people who may not even want this file.

If we really do need to install it with desktop-file-install, we could
do a configure check for that program, of course.

Thanks,

-Carl

Re: [PATCH] Add install target for desktop files.

[Carl Worth]

[-- Attachment #1: Type: text/plain, Size: 653 bytes --]

On Sun, 22 Nov 2009 15:17:11 -0600, "Jeffrey C. Ollie" <jeff@ocjtech.us> wrote:
> Add an install target that uses desktop-file-install to install the
> desktop file in the appropriate location.  The location of the install
> can be modified by changing the desktop_dir variable.
> 
> Signed-off-by: Jeffrey C. Ollie <jeff@ocjtech.us>

Thanks Jeff,

I've rebased this to master and committed it, (on an airplane, so hopefully
I'll remember to push it out when I get back on a network and this mail
goes out[*]).

-Carl

[*] Hmm... would be nice if I had an easy way to queue up a git push
similar to the way I'm queuing up this email...

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]