diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 16:48:02 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 16:48:02 +0100 |
| commit | abdaad68fb94e2d61448a6dfc14847df8a2c32b9 (patch) | |
| tree | 26855c5dd3bfffdbf319d5ba4a38223a28de3e7c /misc/Makefile.am | |
| parent | 0f67b3cc674377559e66c5a6729fd499049a992f (diff) | |
| parent | dd7f98a232efe86f6e6055119c9414a0f9d9e67b (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'misc/Makefile.am')
| -rw-r--r-- | 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 |