From f5090532fb1a0ea13ad45a368051ae7e6028a382 Mon Sep 17 00:00:00 2001
From: Ansa89 <ansalonistefano@gmail.com>
Date: Tue, 21 Oct 2014 10:31:30 +0200
Subject: [PATCH] Makefile: add toxic.desktop to install target

---
 cfg/global_vars.mk     |  2 ++
 cfg/targets/install.mk | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/cfg/global_vars.mk b/cfg/global_vars.mk
index 3d65601..9c70dfe 100644
--- a/cfg/global_vars.mk
+++ b/cfg/global_vars.mk
@@ -16,6 +16,7 @@ MISC_DIR = $(BASE_DIR)/misc
 # Project files
 MANFILES = toxic.1 toxic.conf.5
 DATAFILES = DHTnodes DNSservers toxic.conf.example
+DESKFILE = toxic.desktop
 SNDFILES = ToxicContactOnline.wav ToxicContactOffline.wav ToxicError.wav
 SNDFILES += ToxicRecvMessage.wav ToxicOutgoingCall.wav ToxicIncomingCall.wav
 SNDFILES += ToxicTransferComplete.wav ToxicTransferStart.wav
@@ -25,3 +26,4 @@ PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
 DATADIR = $(PREFIX)/share/toxic
 MANDIR = $(PREFIX)/share/man
+APPDIR = $(PREFIX)/share/applications
diff --git a/cfg/targets/install.mk b/cfg/targets/install.mk
index 51beb3e..2936568 100644
--- a/cfg/targets/install.mk
+++ b/cfg/targets/install.mk
@@ -1,21 +1,19 @@
 # Install target
 install: toxic
-	mkdir -p $(abspath $(DESTDIR)/$(BINDIR))
-	mkdir -p $(abspath $(DESTDIR)/$(DATADIR))
-	mkdir -p $(abspath $(DESTDIR)/$(DATADIR))/sounds
-	mkdir -p $(abspath $(DESTDIR)/$(MANDIR))
-
 	@echo "Installing toxic executable"
-	@install -m 0755 toxic $(abspath $(DESTDIR)/$(BINDIR))
+	@install -Dm 0755 toxic $(abspath $(DESTDIR)/$(BINDIR)/toxic)
+
+	@echo "Installing desktop file"
+	@install -Dm 0644 $(MISC_DIR)/$(DESKFILE) $(abspath $(DESTDIR)/$(APPDIR)/$(DESKFILE))
 
 	@echo "Installing data files"
 	@for f in $(DATAFILES) ; do \
-		install -m 0644 $(MISC_DIR)/$$f $(abspath $(DESTDIR)/$(DATADIR)) ;\
-		file=$(abspath $(DESTDIR)/$(DATADIR))/$$f ;\
+		install -Dm 0644 $(MISC_DIR)/$$f $(abspath $(DESTDIR)/$(DATADIR)/$$f) ;\
+		file=$(abspath $(DESTDIR)/$(DATADIR)/$$f) ;\
 		sed -i'' -e 's:__DATADIR__:'$(abspath $(DATADIR))':g' $$file ;\
 	done
 	@for f in $(SNDFILES) ; do \
-		install -m 0644 $(SND_DIR)/$$f $(abspath $(DESTDIR)/$(DATADIR))/sounds ;\
+		install -Dm 0644 $(SND_DIR)/$$f $(abspath $(DESTDIR)/$(DATADIR)/sounds/$$f) ;\
 	done
 
 	@echo "Installing man pages"
@@ -25,8 +23,7 @@ install: toxic
 		fi ;\
 		section=$(abspath $(DESTDIR)/$(MANDIR))/man`echo $$f | rev | cut -d "." -f 1` ;\
 		file=$$section/$$f ;\
-		mkdir -p $$section ;\
-		install -m 0644 $(DOC_DIR)/$$f $$file ;\
+		install -Dm 0644 $(DOC_DIR)/$$f $$file ;\
 		sed -i'' -e 's:__VERSION__:'$(VERSION)':g' $$file ;\
 		sed -i'' -e 's:__DATADIR__:'$(abspath $(DATADIR))':g' $$file ;\
 		gzip -f -9 $$file ;\