all repos — mgba @ 1f10613d1b7e96d362660c81c37ccf78c2276f7d

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

1f10613d1b7e96d362660c81c37ccf78c2276f7d

parent

1f899737d9825f60e6713fed4ff6d368dda32e56

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

jump to
M CHANGES → CHANGES 
@@ -1,6 +1,7 @@
 0.4.0: (Future)
 Bugfixes:
  - Qt: Windows no longer spawn in the top left on first launch
+ - Qt: Fix install path of XDG desktop file with DESTDIR
 Misc:
  - Qt: Window size command line options are now supported
  - Qt: Increase usability of key mapper
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)