From: John Stebbins <jstebbins.hb@gmail.com>
Date: Tue, 5 Jun 2018 17:00:20 +0000 (-0700)
Subject: flatpak: change "appdata" dir to "metainfo"
X-Git-Tag: 1.2.0~394
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=598ab78572f5aafc747cd570092d0cdeaa31f85c;p=handbrake

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 9b03fcb5b..2a610361c 100644
--- 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 11a4d3383..21bcaa157 100644
--- 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
 
 ###############################################################################