eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #335 from atsampson/installdesktop2

Browse source 
Better jamulus.desktop installation
This commit is contained in:
Volker Fischer 2020-06-05 22:34:36 +02:00 committed by GitHub
commit ff54814264
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

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

15
Jamulus.pro
View file

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

2
distributions/jamulus.desktop → distributions/jamulus.desktop.in
View file

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