diff options
author | Matthias Klumpp <matthias@tenstral.net> | 2017-08-08 08:54:12 +0100 |
---|---|---|
committer | Richard Hughes <richard@hughsie.com> | 2017-08-08 08:54:18 +0100 |
commit | 9df56f26f047e6f59be5265cf97eb54a41f6a94e (patch) | |
tree | fa0cb4f47aa463df9c4bcd87da7c31f4c02df3d7 | |
parent | 937db6fb740b1bb125ba2fe7241b741233f7363d (diff) | |
download | appstream-glib-9df56f26f047e6f59be5265cf97eb54a41f6a94e.tar.gz |
Prefer /usr/share/metainfo as default path for metainfo files
This makes asglib align with the AppStream spec, which sees
/usr/share/metainfo as the canonical location for storing metadata, and
/usr/share/appdata as legacy (but still must-be-supported) location.
Signed-off-by: Richard Hughes <richard@hughsie.com>
-rw-r--r-- | client/as-util.c | 2 | ||||
-rw-r--r-- | data/appdata-xml.m4 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/client/as-util.c b/client/as-util.c index f9c8715..76a3473 100644 --- a/client/as-util.c +++ b/client/as-util.c @@ -3857,7 +3857,7 @@ as_util_split_appstream (AsUtilPrivate *priv, gchar **values, GError **error) } /* save to a file */ - path = g_build_filename (destdir, "usr", "share", "appdata", fn, NULL); + path = g_build_filename (destdir, "usr", "share", "metainfo", fn, NULL); g_debug ("saving %s as %s", id, path); file_app = g_file_new_for_path (path); if (!as_app_to_file (app, file_app, NULL, error)) diff --git a/data/appdata-xml.m4 b/data/appdata-xml.m4 index 765d95c..f1f5096 100644 --- a/data/appdata-xml.m4 +++ b/data/appdata-xml.m4 @@ -36,7 +36,7 @@ AU_DEFUN([APPDATA_XML], AS_IF([test "x$enable_appdata_validate" = "xyes"], [AC_MSG_ERROR([AppData validation was requested but appstream-util was not found])])]) - AC_SUBST([appdataxmldir], [${datadir}/appdata]) + AC_SUBST([appdataxmldir], [${datadir}/metainfo]) APPDATA_XML_RULES=' .PHONY : uninstall-appdata-xml install-appdata-xml clean-appdata-xml |