[shotwell/shotwell-0.26] Fix rules for appstream files



commit 15cc83b25c44939571d42210cbb02a7825756b8c
Author: Thomas Moschny <thomas moschny gmx de>
Date:   Sun Aug 13 09:47:00 2017 +0000

    Fix rules for appstream files
    
    The appdata file is neither created nor installed, as the rules in
    @APPSTREAM_XML_RULES@ expect files to be listed in $(appstream_XML)
    rather than in $(appdata_XML).
    
    https://bugzilla.gnome.org/show_bug.cgi?id=784883

 misc/Makefile.am |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 711b06f..aa9a2bd 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -2,14 +2,14 @@ gsettings_SCHEMAS = \
        org.yorba.shotwell.gschema.xml \
        org.yorba.shotwell-extras.gschema.xml
 
-appdata_in_files = $(srcdir)/shotwell.appdata.xml.in
-appdata_XML = \
+appstream_in_files = $(srcdir)/shotwell.appdata.xml.in
+appstream_XML = \
        shotwell.appdata.xml
 
 desktopdir = $(datadir)/applications
 desktop_DATA = shotwell.desktop shotwell-viewer.desktop
 
-$(appdata_XML) : $(appdata_in_files)
+$(appstream_XML) : $(appstream_in_files)
        $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 %.desktop.in : %.desktop.in.in
@@ -21,12 +21,12 @@ $(appdata_XML) : $(appdata_in_files)
 @GSETTINGS_RULES@
 @APPSTREAM_XML_RULES@
 
-CLEANFILES = $(appdata_XML) $(desktop_DATA) $(desktop_in_files)
+CLEANFILES = $(appstream_XML) $(desktop_DATA) $(desktop_in_files)
 
 dist_noinst_DATA = \
        $(srcdir)/shotwell.desktop.in.in \
        $(srcdir)/shotwell-viewer.desktop.in.in \
        $(gsettings_SCHEMAS) \
-       $(appdata_in_files)
+       $(appstream_in_files)
 
 -include $(top_srcdir)/git.mk


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