diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:38:57 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:38:57 +0100 |
| commit | f1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch) | |
| tree | a1f2ab30332a6383b0677bfcc2aec687b98851d6 /misc/Makefile.am | |
| parent | f8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff) | |
| parent | ede50c561ec9811704821a9ea0f04c3d6c20b5af (diff) | |
Merge branch 'release/0.26.4-1'0.26.4-1
Diffstat (limited to 'misc/Makefile.am')
| -rw-r--r-- | misc/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/misc/Makefile.am b/misc/Makefile.am index 6376879..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 @@ -19,14 +19,14 @@ $(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) +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 |