summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2018-06-25 15:30:12 +0200
committerLubomir Rintel <lkundrak@v3.sk>2018-06-25 15:30:12 +0200
commitfeac6858997e9bd08b06bf191819ccfdb5262bae (patch)
tree3f1244f1e7487f99c71cfc8ebbe6efae9c12dbfd
parenta227980e4dfb148fed7d9a73afe429ad65815e6a (diff)
downloadnetwork-manager-applet-feac6858997e9bd08b06bf191819ccfdb5262bae.tar.gz
build: install the appdata to a non-legacy location
The current AppStream specification prefers /usr/share/metainfo eveyone who relies on this (that's distros, not the end users) already supports the new location. https://gitlab.gnome.org/GNOME/network-manager-applet/issues/2
-rw-r--r--Makefile.am2
-rw-r--r--meson.build2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 16c61c6d..2019adb2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -979,7 +979,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
gsettings_SCHEMAS = org.gnome.nm-applet.gschema.xml
@GSETTINGS_RULES@
-appdatadir = $(datadir)/appdata
+appdatadir = $(datadir)/metainfo
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
appdata_in_files = nm-connection-editor.appdata.xml.in
@INTLTOOL_XML_RULE@
diff --git a/meson.build b/meson.build
index 6b6eb98a..db612fc1 100644
--- a/meson.build
+++ b/meson.build
@@ -403,7 +403,7 @@ custom_target(
output: appdata,
command: intltool_xml_cmd,
install: true,
- install_dir: join_paths(nma_datadir, 'appdata')
+ install_dir: join_paths(nma_datadir, 'metainfo')
)
schema_conf = configuration_data()