From 3b5cc486bf0eb745c772101d74234750c803cde0 Mon Sep 17 00:00:00 2001
From: Mike Fleetwood <mike.fleetwood@googlemail.com>
Date: Mon, 29 Jan 2024 20:07:46 +0000
Subject: [PATCH] Rename Makefile.am variables to APPSTREAM*/appstream* (#241)

As the AppStream 1.0 [1] specification no longer describes them as
appdata files, but instead as metainfo files, rename the Makefile.am
variables for consistency with the name of the standard.

[1] AppStream 1.0
    https://www.freedesktop.org/software/appstream/docs/index.html

Closes #241 - Move appstream metadata out of legacy path
---
 Makefile.am | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d9f58631..6952391a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,12 +16,12 @@ desktop_DATA = $(DESKTOP_FILES)
 $(DESKTOP_FILES): $(DESKTOP_IN_FILES)
 	$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
-APPDATA_IN_FILES = gparted.appdata.xml.in
-APPDATA_FILES =$(APPDATA_IN_FILES:.xml.in=.xml)
-appdatadir = $(datadir)/metainfo
-appdata_DATA = $(APPDATA_FILES)
+APPSTREAM_IN_FILES = gparted.appdata.xml.in
+APPSTREAM_FILES =$(APPSTREAM_IN_FILES:.xml.in=.xml)
+appstreamdir = $(datadir)/metainfo
+appstream_DATA = $(APPSTREAM_FILES)
 
-$(APPDATA_FILES): $(APPDATA_IN_FILES)
+$(APPSTREAM_FILES): $(APPSTREAM_IN_FILES)
 	$(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 polkit_action_in_in_FILES = org.gnome.gparted.policy.in.in
@@ -78,14 +78,14 @@ dist-hook:
 	fi
 
 EXTRA_DIST =			\
-	$(APPDATA_IN_FILES)	\
-	$(APPDATA_FILES)	\
+	$(APPSTREAM_IN_FILES)	\
+	$(APPSTREAM_FILES)	\
 	$(DESKTOP_IN_IN_FILES)	\
 	$(DESKTOP_FILES)	\
 	$(polkit_action_in_in_FILES)  \
 	gparted.in
 
 DISTCLEANFILES =		\
-	$(appdata_DATA)		\
+	$(appstream_DATA)	\
 	$(desktop_DATA)		\
 	$(polkit_action_DATA)