summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-08-13 16:32:28 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-08-13 16:32:28 +0200
commit0f67b3cc674377559e66c5a6729fd499049a992f (patch)
treedb385afa84c09891e9a83c18b6e5436cf6e983ed /misc
parentf8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff)
parent6cee6189adf46287667c35707325dd0820ea9f33 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'misc')
-rw-r--r--misc/Makefile.am2
-rw-r--r--misc/Makefile.in7
2 files changed, 5 insertions, 4 deletions
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 6376879..711b06f 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -19,7 +19,7 @@ $(appdata_XML) : $(appdata_in_files)
$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
@GSETTINGS_RULES@
-@APPDATA_XML_RULES@
+@APPSTREAM_XML_RULES@
CLEANFILES = $(appdata_XML) $(desktop_DATA) $(desktop_in_files)
diff --git a/misc/Makefile.in b/misc/Makefile.in
index ece7535..36072f4 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -90,7 +90,8 @@ build_triplet = @build@
host_triplet = @host@
subdir = misc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_generate_changelog.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \
+ $(top_srcdir)/m4/ax_generate_changelog.m4 \
$(top_srcdir)/m4/ax_is_release.m4 \
$(top_srcdir)/m4/ax_require_defined.m4 \
$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gsettings.m4 \
@@ -297,7 +298,7 @@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
-appdataxmldir = @appdataxmldir@
+appstreamxmldir = @appstreamxmldir@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -585,7 +586,7 @@ $(appdata_XML) : $(appdata_in_files)
$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
@GSETTINGS_RULES@
-@APPDATA_XML_RULES@
+@APPSTREAM_XML_RULES@
-include $(top_srcdir)/git.mk