[gnome-settings-daemon] build: Don't use AS_AC_EXPAND

[Colin Walters <walters src gnome org>]

commit f5d3be97eb789e3230db11c7877b0d7ae8a37b7b
Author: Colin Walters <walters verbum org>
Date:   Fri Dec 2 16:39:45 2011 -0500

    build: Don't use AS_AC_EXPAND
    
    It's recommended by the Automake authors to use sed on data files
    in the build rules instead.  It just works more cleanly with
    the design of the autotools.

 configure.ac                             |    3 ---
 data/Makefile.am                         |    3 +++
 data/gnome-settings-daemon.desktop.in.in |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7c1bcc2..acead53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,8 +36,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of default gettext
 
 AM_GLIB_GNU_GETTEXT
 
-AS_AC_EXPAND(LIBEXECDIR, "$libexecdir")
-
 GSD_INTLTOOL_PLUGIN_RULE='%.gnome-settings-plugin:   %.gnome-settings-plugin.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
 AC_SUBST([GSD_INTLTOOL_PLUGIN_RULE])
 
@@ -486,7 +484,6 @@ plugins/wacom/Makefile
 plugins/xrandr/Makefile
 plugins/xsettings/Makefile
 data/Makefile
-data/gnome-settings-daemon.desktop.in
 data/gnome-settings-daemon.pc
 data/gnome-settings-daemon-uninstalled.pc
 data/org.gnome.settings-daemon.plugins.gschema.xml.in
diff --git a/data/Makefile.am b/data/Makefile.am
index 43ba27c..bab7359 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -45,6 +45,9 @@ desktopdir = $(sysconfdir)/xdg/autostart
 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 $@
+
 servicedir = $(datadir)/dbus-1/services
 service_in_files = org.gnome.SettingsDaemon.service.in
 service_DATA = $(service_in_files:.service.in=.service)
diff --git a/data/gnome-settings-daemon.desktop.in.in b/data/gnome-settings-daemon.desktop.in.in
index b090fc3..5307d40 100644
--- a/data/gnome-settings-daemon.desktop.in.in
+++ b/data/gnome-settings-daemon.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 _Name=GNOME Settings Daemon
-Exec= LIBEXECDIR@/gnome-settings-daemon
+Exec= libexecdir@/gnome-settings-daemon
 OnlyShowIn=GNOME;Unity;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization