From 376a78dc0c10e3f2380f0c83b88e37945c857ad7 Mon Sep 17 00:00:00 2001 From: orbea Date: Sat, 27 Aug 2016 19:31:05 -0700 Subject: [PATCH] /usr/share/applications is for desktop files --- Makefile | 21 +++++++++++---------- frontend/drivers/platform_linux.c | 14 ++++++++++---- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 25d4062d1f..c31ab2a7aa 100644 --- a/Makefile +++ b/Makefile @@ -181,17 +181,17 @@ install: $(TARGET) install -m644 media/retroarch.svg $(DESTDIR)$(PREFIX)/share/pixmaps @if test -d media/assets; then \ echo "Installing media assets..."; \ - mkdir -p $(DESTDIR)$(PREFIX)/share/applications/retroarch; \ - mkdir -p $(DESTDIR)$(PREFIX)/share/applications/retroarch/assets; \ - mkdir -p $(DESTDIR)$(PREFIX)/share/applications/retroarch/assets/xmb; \ - mkdir -p $(DESTDIR)$(PREFIX)/share/applications/retroarch/assets/glui; \ - cp -r media/assets/xmb/ $(DESTDIR)$(PREFIX)/share/applications/retroarch/assets; \ - cp -r media/assets/glui/ $(DESTDIR)$(PREFIX)/share/applications/retroarch/assets; \ + mkdir -p $(DESTDIR)$(PREFIX)/share/retroarch; \ + mkdir -p $(DESTDIR)$(PREFIX)/share/retroarch/assets; \ + mkdir -p $(DESTDIR)$(PREFIX)/share/retroarch/assets/xmb; \ + mkdir -p $(DESTDIR)$(PREFIX)/share/retroarch/assets/glui; \ + cp -r media/assets/xmb/ $(DESTDIR)$(PREFIX)/share/retroarch/assets; \ + cp -r media/assets/glui/ $(DESTDIR)$(PREFIX)/share/retroarch/assets; \ echo "Removing unneeded source image files.."; \ - rm -rf $(DESTDIR)$(PREFIX)/share/applications/retroarch/assets/xmb/flatui/src; \ - rm -rf $(DESTDIR)$(PREFIX)/share/applications/retroarch/assets/xmb/monochrome/src; \ - rm -rf $(DESTDIR)$(PREFIX)/share/applications/retroarch/assets/xmb/retroactive/src; \ - rm -rf $(DESTDIR)$(PREFIX)/share/applications/retroarch/assets/xmb/retroactive_marked/src; \ + rm -rf $(DESTDIR)$(PREFIX)/share/retroarch/assets/xmb/flatui/src; \ + rm -rf $(DESTDIR)$(PREFIX)/share/retroarch/assets/xmb/monochrome/src; \ + rm -rf $(DESTDIR)$(PREFIX)/share/retroarch/assets/xmb/retroactive/src; \ + rm -rf $(DESTDIR)$(PREFIX)/share/retroarch/assets/xmb/retroactive_marked/src; \ echo "Asset copying done."; \ fi @@ -203,6 +203,7 @@ uninstall: rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch.6 rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch-cg2glsl.6 rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/retroarch.svg + rm -rf $(DESTDIR)$(PREFIX)/share/retroarch/assets clean: rm -rf $(OBJDIR) diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c index 8e3e4f6303..dd2927e8b5 100644 --- a/frontend/drivers/platform_linux.c +++ b/frontend/drivers/platform_linux.c @@ -1711,11 +1711,17 @@ static void frontend_linux_get_env(int *argc, fill_pathname_join(g_defaults.dir.autoconfig, base_path, "autoconfig", sizeof(g_defaults.dir.autoconfig)); - if (path_is_directory("/usr/local/share/applications/retroarch/assets")) - fill_pathname_join(g_defaults.dir.assets, "/usr/local/share/applications/retroarch", + if (path_is_directory("/usr/local/share/retroarch/assets")) + fill_pathname_join(g_defaults.dir.assets, "/usr/local/share/retroarch", "assets", sizeof(g_defaults.dir.assets)); - else if (path_is_directory("/usr/share/applications/retroarch/assets")) - fill_pathname_join(g_defaults.dir.assets, "/usr/share/applications/retroarch", + else if (path_is_directory("/usr/share/retroarch/assets")) + fill_pathname_join(g_defaults.dir.assets, "/usr/share/retroarch", + "assets", sizeof(g_defaults.dir.assets)); + else if (path_is_directory("/usr/local/share/games/retroarch/assets")) + fill_pathname_join(g_defaults.dir.assets, "/usr/local/share/games/retroarch", + "assets", sizeof(g_defaults.dir.assets)); + else if (path_is_directory("/usr/share/games/retroarch/assets")) + fill_pathname_join(g_defaults.dir.assets, "/usr/share/games/retroarch", "assets", sizeof(g_defaults.dir.assets)); else fill_pathname_join(g_defaults.dir.assets, base_path,