[shotwell] Use new location for appdata files
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell] Use new location for appdata files
- Date: Mon, 1 Jan 2018 12:43:56 +0000 (UTC)
commit c625d5b3476aa45903633b4904761bbc4fa18fe2
Author: Jens Georg <mail jensge org>
Date: Mon Jan 1 13:26:13 2018 +0100
Use new location for appdata files
https://bugzilla.gnome.org/show_bug.cgi?id=790185
m4/appstream-xml.m4 | 4 ++--
misc/meson.build | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/m4/appstream-xml.m4 b/m4/appstream-xml.m4
index 1472802..11ed91a 100644
--- a/m4/appstream-xml.m4
+++ b/m4/appstream-xml.m4
@@ -10,7 +10,7 @@ dnl Add @APPSTREAM_XML_RULES@ to a Makefile.am to substitute the make rules. Add
dnl .appdata.xml files to appstream_XML in Makefile.am and they will be validated
dnl at make check time, if appstream-util is installed, as well as installed
dnl to the correct location automatically. Add --enable-appstream-util to
-dnl DISTCHECK_CONFIGURE_FLAGS in Makefile.am to require valid AppData XML when
+dnl AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am to require valid AppData XML when
dnl doing a distcheck.
dnl
dnl Adding files to appstream_XML does not distribute them automatically.
@@ -36,7 +36,7 @@ AC_DEFUN([APPSTREAM_XML],
AS_IF([test "x$enable_appstream_validate" = "xyes"],
[AC_MSG_ERROR([AppData validation was requested but appstream-util was not found])])])
- AC_SUBST([appstreamxmldir], [${datadir}/appdata])
+ AC_SUBST([appstreamxmldir], [${datadir}/metainfo])
APPSTREAM_XML_RULES='
.PHONY : uninstall-appstream-xml install-appstream-xml clean-appstream-xml
diff --git a/misc/meson.build b/misc/meson.build
index f4b766d..664ddb0 100644
--- a/misc/meson.build
+++ b/misc/meson.build
@@ -5,7 +5,7 @@ i18n.merge_file(input : 'shotwell.appdata.xml.in',
po_dir : join_paths('..', 'po'),
type : 'xml',
install: true,
- install_dir : join_paths(get_option('datadir'), 'appdata'))
+ install_dir : join_paths(get_option('datadir'), 'metainfo'))
i18n.merge_file(input : 'shotwell.desktop.in',
output: 'shotwell.desktop',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]