[hitori] Use APPSTREAM_XML instead of APPDATA_XML

[David King <davidk src gnome org>]

commit 01f8f3cb2b5a5bbe5b59427cb0c950f6f0fbfe25
Author: David King <amigadave amigadave com>
Date:   Fri Sep 12 16:44:51 2014 +0100

    Use APPSTREAM_XML instead of APPDATA_XML
    
    https://bugzilla.gnome.org/show_bug.cgi?id=736571

 Makefile.am  |   12 ++++++------
 configure.ac |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9be7a14..ba7d45d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,14 +100,14 @@ EXTRA_DIST += \
 CLEANFILES = $(desktop_DATA)
 
 # AppData
- APPDATA_XML_RULES@
+ APPSTREAM_XML_RULES@
 @INTLTOOL_XML_RULE@
 
-appdata_in_files = data/hitori.appdata.xml.in
-appdata_XML = $(appdata_in_files:.appdata.xml.in=.appdata.xml)
+appstream_in_files = data/hitori.appdata.xml.in
+appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml)
 
-EXTRA_DIST += $(appdata_in_files)
-CLEANFILES += $(appdata_XML)
+EXTRA_DIST += $(appstream_in_files)
+CLEANFILES += $(appstream_XML)
 
 # Gubbins
 EXTRA_DIST += \
@@ -156,7 +156,7 @@ MAINTAINERCLEANFILES = \
        po/remove-potcdate.sin \
        $(NULL)
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-appdata-validate
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-appstream-util
 
 # Copy all the spec files. Of course, only one is actually used.
 dist-hook:
diff --git a/configure.ac b/configure.ac
index 7f244c7..1f66187 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ GLIB_GSETTINGS
 YELP_HELP_INIT
 
 # AppData
-APPDATA_XML
+APPSTREAM_XML
 
 # Dependencies
 PKG_CHECK_MODULES([GENERAL],[glib-2.0 gio-2.0 >= 2.32 gtk+-3.0 >= 3.13.2 gmodule-2.0 cairo >= 1.4])