Makefile: Makefile updates

- Install emmental.desktop as com.nowheycreamery.emmental.desktop
- Fix up variables used in the 'uninstall' target

Fixes: #61 (Rename .desktop file)
Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>

Makefile

@@ -55,7 +55,7 @@ install.desktop:
 	desktop-file-install --set-key=Exec --set-value $(EMMENTAL_BIN)/emmental \
 		--set-key=Icon --set-value=$(EMMENTAL_LIB)/emmental.svg \
 		--rebuild-mime-info-cache \
-		--dir=$(EMMENTAL_SHARE)/applications emmental.desktop
+		--dir=$(EMMENTAL_SHARE)/applications com.nowheycreamery.emmental.desktop
 
 .PHONY: install
 install: emmental.gresource mpris2 install.app install.icons install.desktop
@@ -65,9 +65,9 @@ install: emmental.gresource mpris2 install.app install.icons install.desktop
 
 .PHONY: uninstall
 uninstall:
-	rm -f ${PREFIX}/share/applications/com.nowheycreamery.emmental.desktop
-	rm -f ${PREFIX}/bin/emmental
-	rm -rf ${PREFIX}/lib/emmental/
+	rm -f ${EMMENTAL_SHARE}/applications/com.nowheycreamery.emmental.desktop
+	rm -f ${EMMENTAL_BIN}/emmental
+	rm -rf ${EMMENTAL_LIB}/emmental/
 
 .PHONY: pkgbuild.pkgver
 pkgbuild.pkgver:

emmental.desktop

@@ -9,3 +9,4 @@ Terminal=false
 MimeType=application/musepack;application/ogg;application/x-ape;application/x-flac;application/x-id3;application/x-musepack;application/x-ogg;application/x-ogm-audio;audio/aac;audio/ape;audio/flac;audio/mp;audio/mp3;audio/mp4;audio/mpc;audio/mpeg;audio/mpeg3;audio/mpegurl;audio/musepack;audio/ogg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-ape;audio/x-flac;audio/x-it;audio/x-m4a;audio/x-mod;audio/x-mp;audio/x-mp3;audio/x-mpc;audio/x-mpeg;audio/x-mpeg-3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-ogg;audio/x-oggflac;audio/x-pn-realaudio;audio/x-s3m;audio/x-scpls;audio/x-speex;audio/x-stm;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-wav;audio/x-xm;
 Categories=AudioVideo;Audio;Music;Player;GTK;GNOME;
 SingleMainWindow=true
+StartupWMClass=emmental.py