From 53408e3768e479a76f8d1ba7d231fe9b4943135f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 26 Apr 2013 14:20:49 +0200 Subject: [PATCH] Install file associations and icons using autotools (issue #605) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Condensed version of pull request #24, containing the following commits: - 31f803f Install .desktop and mime-info files with autotools. - a354096 unix: Install icon using autotools as well. - 4b1beb2 Fix Icon= in love.desktop. - d0d3fe4 unix: Install game file icon as well. - 9a6e291 unix: Update/fix README file name in Makefile.am. All of the above commits were made by Michał Górny, and this single code import was committed by Bart van Strien (so blame me if I broke it..) --- platform/unix/Makefile.am | 22 ++++++++++++++++++- .../{game.svg => application-x-love-game.svg} | 0 platform/unix/configure.ac | 2 ++ .../unix/{love.desktop => love.desktop.in} | 5 ++--- platform/unix/{app.svg => love.svg} | 0 5 files changed, 25 insertions(+), 4 deletions(-) rename platform/unix/{game.svg => application-x-love-game.svg} (100%) rename platform/unix/{love.desktop => love.desktop.in} (84%) rename platform/unix/{app.svg => love.svg} (100%) diff --git a/platform/unix/Makefile.am b/platform/unix/Makefile.am index 11db97c4a..68edf4779 100644 --- a/platform/unix/Makefile.am +++ b/platform/unix/Makefile.am @@ -1,3 +1,23 @@ ACLOCAL_AMFLAGS = -I platform/unix/m4 SUBDIRS = src -EXTRA_DIST = changes.txt license.txt readme.txt +EXTRA_DIST = changes.txt license.txt readme.md \ + platform/unix/love.desktop.in + +applicationsdir=$(datarootdir)/applications +mimeinfodir=$(datarootdir)/mime/packages +pixmapsdir=$(datarootdir)/pixmaps +mimeiconsdir=$(datarootdir)/icons/hicolor/scalable/mimetypes + +applications_DATA = platform/unix/love.desktop +dist_mimeinfo_DATA = platform/unix/love.xml +dist_pixmaps_DATA = platform/unix/love.svg +dist_mimeicons_DATA = platform/unix/application-x-love-game.svg + +platform/unix/love.desktop: platform/unix/love.desktop.in + $(MKDIR_P) platform/unix + rm -f $@ $@.tmp + $(SED) \ + -e "s|@bindir[@]|$(bindir)|" \ + ${srcdir}/$@.in > $@.tmp + chmod a-w $@.tmp + mv $@.tmp $@ diff --git a/platform/unix/game.svg b/platform/unix/application-x-love-game.svg similarity index 100% rename from platform/unix/game.svg rename to platform/unix/application-x-love-game.svg diff --git a/platform/unix/configure.ac b/platform/unix/configure.ac index 8ba3bc264..27659bdc3 100644 --- a/platform/unix/configure.ac +++ b/platform/unix/configure.ac @@ -10,6 +10,8 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) AC_PROG_LIBTOOL AC_PROG_CC AC_PROG_CXX +AC_PROG_SED +AC_PROG_MKDIR_P AC_C_BIGENDIAN AC_SEARCH_LIBS([sqrt], [m], [], AC_MSG_ERROR([Can't LÖVE without C math library])) AC_SEARCH_LIBS([SDL_Init], [SDL], [], AC_MSG_ERROR([Can't LÖVE without SDL])) diff --git a/platform/unix/love.desktop b/platform/unix/love.desktop.in similarity index 84% rename from platform/unix/love.desktop rename to platform/unix/love.desktop.in index 65e141b48..3a9e2df12 100644 --- a/platform/unix/love.desktop +++ b/platform/unix/love.desktop.in @@ -2,10 +2,9 @@ Name=LÖVE Comment=The unquestionably awesome 2D game engine MimeType=application/x-love-game; -Exec=/usr/bin/love +Exec=@bindir@/love Type=Application Categories=Development;Game; Terminal=false -Icon=love.svg +Icon=love NoDisplay=true - diff --git a/platform/unix/app.svg b/platform/unix/love.svg similarity index 100% rename from platform/unix/app.svg rename to platform/unix/love.svg