[gnome-panel] remove *.desktop.in from AC_CONFIG_FILES

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 746383225c4b45fd568462e761777bd78abd5a4b
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Sep 26 06:08:43 2015 +0300

    remove *.desktop.in from AC_CONFIG_FILES

 configure.ac            |    1 -
 gnome-panel/Makefile.am |   16 +++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b3b54d3..9398d3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -269,7 +269,6 @@ AC_CONFIG_FILES([
   gnome-panel/Makefile
   gnome-panel/libpanel-applet-private/Makefile
   gnome-panel/libpanel-util/Makefile
-  gnome-panel/gnome-panel.desktop.in
 
   libpanel-applet/Makefile
   libpanel-applet/libpanel-applet.pc
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index 5b23f09..8308edf 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 SUBDIRS = libpanel-applet-private libpanel-util
 
 bin_PROGRAMS = \
@@ -246,9 +248,13 @@ panel-test-applets-resources.h: panel-test-applets.gresource.xml $(shell $(GLIB_
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name panel $<
 
 desktopdir = $(datadir)/applications
+desktop_in_in_files = gnome-panel.desktop.in.in
 desktop_in_files = gnome-panel.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
+%.desktop.in: %.desktop.in.in
+       $(AM_V_GEN) sed -e 's,[ ]VERSION[@],$(VERSION),g' < $< > $@
+
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST =                                   \
@@ -260,14 +266,14 @@ EXTRA_DIST =                                      \
        panel-test-applets.gresource.xml        \
        panel-marshal.list                      \
        wanda_no_sea.png                        \
-       $(desktop_in_files)
+       $(desktop_in_in_files) \
+       $(NULL)
 
 CLEANFILES = \
        $(BUILT_SOURCES) \
        $(sys_DATA) \
-       $(desktop_DATA)
-
-dist-hook:
-       cd $(distdir) ; rm -f $(CLEANFILES)
+       $(desktop_in_files) \
+       $(desktop_DATA) \
+       $(NULL)
 
 -include $(top_srcdir)/git.mk