flatpak: change "appdata" dir to "metainfo"

The specificaion for where appstream files go changed

diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 9b03fcb5b055258b6390fc9804e6822bcd12a9c9..2a610361caf94768f9cedbe352faece9cec84038 100644 (file)
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -190,7 +190,7 @@ uninstall-local:
        fi
        rm -f $(DESTDIR)/$(datadir)/applications/$(hb_menu)
        @-if test -n "$(flatpak_appdata)"; then \
-               rm -f $(DESTDIR)/$(datadir)/appdata/$(flatpak_appdata); \
+               rm -f $(DESTDIR)/$(datadir)/metainfo/$(flatpak_appdata); \
        fi
 
 install-data-local:
@@ -208,6 +208,6 @@ install-data-local:
        mkdir -p $(DESTDIR)/$(datadir)/applications/; \
        $(INSTALL_DATA) $(srcdir)/$(hb_menu) $(DESTDIR)/$(datadir)/applications/$(hb_menu)
        @-if test -n "$(flatpak_appdata)"; then \
-               mkdir -p $(DESTDIR)/$(datadir)/appdata/; \
-               $(INSTALL_DATA) $(srcdir)/$(flatpak_appdata) $(DESTDIR)/$(datadir)/appdata/$(flatpak_appdata); \
+               mkdir -p $(DESTDIR)/$(datadir)/metainfo/; \
+               $(INSTALL_DATA) $(srcdir)/$(flatpak_appdata) $(DESTDIR)/$(datadir)/metainfo/$(flatpak_appdata); \
        fi

diff --git a/test/module.defs b/test/module.defs
index 11a4d3383c152cc670e15391c91dbdb3acd5d2d0..21bcaa157910a93e50ccd3ef6b3e5366b4a3132d 100644 (file)
--- a/test/module.defs
+++ b/test/module.defs
@@ -43,7 +43,7 @@ TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs))
 TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
 ifeq (1,$(FEATURE.flatpak))
     TEST.appdata   = $(TEST.src/)fr.handbrake.HandBrakeCLI.appdata.xml
-    TEST.install.appdata = $(DESTDIR)$(PREFIX/)share/appdata/$(notdir $(TEST.appdata))
+    TEST.install.appdata = $(DESTDIR)$(PREFIX/)share/metainfo/$(notdir $(TEST.appdata))
 endif
 
 ###############################################################################