[gnome-settings-daemon] Revert "Fix make dist for gnome-settings-daemon.desktop.in.in"

[Frederic Peters <fpeters src gnome org>]

commit db44c7def7149db009798230a335593886b03a30
Author: FrÃdÃric PÃters <fpeters 0d be>
Date:   Fri Dec 23 13:22:43 2011 +0100

    Revert "Fix make dist for gnome-settings-daemon.desktop.in.in"
    
    This reverts commit f3feab498aaa94125094b0d098281e3bd4eaf08d, it broke
    'make distcheck'.

 data/Makefile.am |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 09f81bf..db9b612 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -42,8 +42,8 @@ convert_DATA = gnome-settings-daemon.convert
 
 @INTLTOOL_DESKTOP_RULE@
 desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = gnome-settings-daemon.desktop.in.in
-desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+desktop_in_files = gnome-settings-daemon.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 gnome-settings-daemon.desktop.in: gnome-settings-daemon.desktop.in.in
 	$(AM_V_GEN) sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $  tmp && mv $  tmp $@
@@ -68,6 +68,7 @@ EXTRA_DIST = 					\
 	$(all_schemas:.xml=.xml.in.in)		\
 	$(service_in_files)			\
 	$(desktop_in_files)			\
+	gnome-settings-daemon.desktop.in.in	\
 	$(gsettings_ENUM_FILES)			\
 	gnome-settings-daemon.pc.in		\
 	$(api_DATA)				\