diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-07-09 12:10:38 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-07-09 12:10:38 +0200 |
| commit | 709e2d6f5652ec90c194a4ec2b530bebc6f952cb (patch) | |
| tree | 496b2f3899e1d5728ee9ae76095cc5056c317447 /misc/Makefile.in | |
| parent | f1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (diff) | |
| parent | 5c8be07095cc04a6d8a95204b0504fd7ab030154 (diff) | |
Merge branch 'release/0.28.3-1'0.28.3-1
Diffstat (limited to 'misc/Makefile.in')
| -rw-r--r-- | misc/Makefile.in | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/misc/Makefile.in b/misc/Makefile.in index 0571904..11e02ae 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -353,8 +353,8 @@ desktopdir = $(datadir)/applications desktop_DATA = shotwell.desktop shotwell-viewer.desktop 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) @@ -579,9 +579,6 @@ uninstall-am: uninstall-desktopDATA $(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 $@ |