Merge pull request #335 from atsampson/installdesktop2

Better jamulus.desktop installation

.gitignore

@@ -31,3 +31,4 @@ distributions/opus*
 distributions/jack2
 distributions/claudio_piano.sf2
 distributions/fluidsynth*
+distributions/jamulus.desktop

Jamulus.pro

@@ -301,18 +301,23 @@ win32 {
     }
     BINDIR = $$absolute_path($$BINDIR, $$PREFIX)
     target.path = $$BINDIR
-    INSTALLS += target
 
     isEmpty(APPSDIR) {
         APPSDIR = share/applications
     }
     APPSDIR = $$absolute_path($$APPSDIR, $$PREFIX)
     desktop.path = $$APPSDIR
+    QMAKE_SUBSTITUTES += distributions/jamulus.desktop.in
     desktop.files = distributions/jamulus.desktop
-    # the .desktop file assumes the binary is called jamulus
-    contains(CONFIG, "noupcasename") {
-        INSTALLS += desktop
+
+    isEmpty(ICONSDIR) {
+        ICONSDIR = share/icons/hicolor/512x512/apps
     }
+    ICONSDIR = $$absolute_path($$ICONSDIR, $$PREFIX)
+    icons.path = $$ICONSDIR
+    icons.files = distributions/jamulus.png
+
+    INSTALLS += target desktop icons
 }
 
 RCC_DIR = src/res
@@ -617,6 +622,8 @@ DISTFILES += ChangeLog \
     COPYING \
     INSTALL.md \
     README.md \
+    distributions/jamulus.desktop.in \
+    distributions/jamulus.png \
     src/res/translation/translation_de_DE.qm \
     src/res/translation/translation_fr_FR.qm \
     src/res/translation/translation_pt_PT.qm \

distributions/jamulus.desktop.in

@@ -4,7 +4,7 @@ Comment=Jam Session
 Comment[fr]=Séance de bœuf
 GenericName=Internet Jam Session Software
 GenericName[fr]=Logiciel de séance de bœuf sur Internet
-Exec=jamulus
+Exec=$$TARGET
 Icon=jamulus
 Terminal=false
 Type=Application