diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
| commit | 2b3f22361da0c1d8e6ce70d71352821758186db7 (patch) | |
| tree | 5d10633b47369b3aa52a05bf889ede0dbe5ee108 /misc/Makefile.am | |
| parent | 211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff) | |
| parent | dc6c76eb04dfe3d4262a1806808f0bc0bf523238 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'misc/Makefile.am')
| -rw-r--r-- | misc/Makefile.am | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/misc/Makefile.am b/misc/Makefile.am index aa9a2bd..803697d 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -12,9 +12,6 @@ desktop_DATA = shotwell.desktop shotwell-viewer.desktop $(appstream_XML) : $(appstream_in_files) $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ -%.desktop.in : %.desktop.in.in - $(AM_V_GEN) sed -e 's|@VERSION[@]|$(VERSION)|g' $< > $@ - %.desktop : %.desktop.in $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ @@ -24,8 +21,8 @@ $(appstream_XML) : $(appstream_in_files) CLEANFILES = $(appstream_XML) $(desktop_DATA) $(desktop_in_files) dist_noinst_DATA = \ - $(srcdir)/shotwell.desktop.in.in \ - $(srcdir)/shotwell-viewer.desktop.in.in \ + $(srcdir)/shotwell.desktop.in \ + $(srcdir)/shotwell-viewer.desktop.in \ $(gsettings_SCHEMAS) \ $(appstream_in_files) |