all repos — mgba @ 31d41cf2f62023fd231d10fe8e14b1441651bcc9

mGBA Game Boy Advance Emulator

Qt: Fix install path of XDG desktop file with DESTDIR
Jeffrey Pfau jeffrey@endrift.com
Tue, 18 Aug 2015 22:32:59 -0700
commit

31d41cf2f62023fd231d10fe8e14b1441651bcc9

parent

7be183940cfa7bd3ad1ca0475937de92095c3802

2 files changed, 3 insertions(+), 2 deletions(-)

jump to
M CHANGES → CHANGES 
@@ -1,6 +1,7 @@
-0.4.1: (Future)
+0.3.1: (Future)
 Bugfixes:
  - Qt: Windows no longer spawn in the top left on first launch
+ - Qt: Fix install path of XDG desktop file with DESTDIR
 
 0.3.0: (2015-08-16)
 Features:
M src/platform/qt/CMakeLists.txt → src/platform/qt/CMakeLists.txt 
@@ -167,7 +167,7 @@ BUNDLE DESTINATION Applications COMPONENT ${BINARY_NAME}-qt)
 if(UNIX AND NOT APPLE)
 	find_program(DESKTOP_FILE_INSTALL desktop-file-install)
 	if(DESKTOP_FILE_INSTALL)
-		install(CODE "execute_process(COMMAND ${DESKTOP_FILE_INSTALL} \"${CMAKE_SOURCE_DIR}/res/mgba-qt.desktop\" --dir \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/applications/\")")
+		install(CODE "execute_process(COMMAND ${DESKTOP_FILE_INSTALL} \"${CMAKE_SOURCE_DIR}/res/mgba-qt.desktop\" --dir \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/applications/\")")
 	endif()
 endif()
 if(UNIX)