[gnome-calculator] Fix appdata.xml installation



commit 60f3a35b4614b52ad80b2beba4ae8594a6116a68
Author: Dominique Leuenberger <dimstar opensuse org>
Date:   Tue Jun 20 12:02:37 2017 +0200

    Fix appdata.xml installation
    
    With the migration away from libtool to using APPSTREAM_XML_RULES (commit 800ccb84c) some variables were 
not adjusted.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=783986

 data/Makefile.am |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index a9aca82..691b880 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,10 +8,9 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 $(desktop_DATA): $(desktop_in_files)
        $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
-appdatadir = $(datadir)/appdata
-appdata_XML = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = org.gnome.Calculator.appdata.xml.in
 @APPSTREAM_XML_RULES@
+appstream_in_files = org.gnome.Calculator.appdata.xml.in
+appstream_XML = $(appstream_in_files:.xml.in=.xml)
 
 $(appstream_XML): $(appstream_in_files)
        $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
@@ -19,13 +18,13 @@ $(appstream_XML): $(appstream_in_files)
 man1_MANS = gnome-calculator.1 gcalccmd.1
 
 EXTRA_DIST = \
-       $(appdata_in_files) \
+       $(appstream_in_files) \
        $(desktop_in_files) \
        $(gsettings_SCHEMAS) \
        $(man1_MANS)
 
 CLEANFILES = \
-       $(appdata_DATA) \
+       $(appstream_XML) \
        $(desktop_DATA)
 
 -include $(top_srcdir)/git.mk


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]