From: Colin Clark <cclark@carbon>
Date: Sat, 25 Jan 2020 10:44:57 +0000 (+0000)
Subject: Addl Fix #742: Add appdata file
X-Git-Tag: v1.6~97
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=82b897ca7ada468b9100b912d5f04912e1c343de

Addl Fix #742: Add appdata file

https://github.com/BestImageViewer/geeqie/pull/742

Set installation folder location dependent on $prefix variable.
(Flatpak installation requires to the location to be not where
freedesktop.org defines it)
---

diff --git a/Makefile.am b/Makefile.am
index 2736004c..ab734b2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,11 @@ icondir = $(datadir)/pixmaps
 icon_DATA = geeqie.png
 
 # Location defined by freedesktop.org
+if EXTERNAL_PREFIX
+appdatadir = $(datadir)/metainfo
+else
 appdatadir = /usr/share/metainfo
+endif
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 appdata_in_files = org.geeqie.Geeqie.appdata.xml.in
 @INTLTOOL_XML_RULE@
diff --git a/configure.ac b/configure.ac
index 2ba122f1..07cc5667 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,6 +190,8 @@ AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
 AM_CONDITIONAL(HAVE_WINDRES, test "x$WINDRES" != "x:")
 AC_SUBST(WINDRES)
 
+AM_CONDITIONAL([EXTERNAL_PREFIX], [test "x$prefix" != "xNONE"])
+
 dnl reasonable guesses for where stuff is installed
 if test "x$prefix" = "xNONE"; then
   prefix="/usr/local"