Fix the makefile because the desktop files have changed
Merge branch 'fixmakefile'