[gdm] Update caribou autostart file for caribou path changes

[Ray Strode <halfline src gnome org>]

commit 38108969ee895036d30012576bf27d9877beaa59
Author: Kalev Lember <kalevlember gmail com>
Date:   Fri Sep 12 23:31:03 2014 +0200

    Update caribou autostart file for caribou path changes
    
    The executable was moved from bin to libexec in caribou 0.14.4 release.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=736612

 .gitignore                                         |    1 +
 data/autostart/Makefile.am                         |   13 ++++++++++++-
 ...ostart.desktop => caribou-autostart.desktop.in} |    2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 762cd54..e66e03f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,6 +117,7 @@ data/applications/gok.desktop
 data/applications/orca-screen-reader.desktop
 data/applications/polkit-gnome-authentication-agent-1.desktop
 data/applications/polkit-gnome-authentication-agent-1.desktop.in
+data/autostart/caribou-autostart.desktop
 depcomp
 libgdm/gdm-client-glue.h
 libgdm/gdm-client-glue.c
diff --git a/data/autostart/Makefile.am b/data/autostart/Makefile.am
index ab7bcd9..d6696b5 100644
--- a/data/autostart/Makefile.am
+++ b/data/autostart/Makefile.am
@@ -1,14 +1,25 @@
 NULL =
 
+%.desktop: %.desktop.in Makefile
+       $(AM_V_GEN) sed -e 's|@LIBEXECDIR[ ]|$(libexecdir)|g' $< >$@
+
 desktopdir = $(pkgdatadir)/greeter/autostart
+desktop_in_files =                                                     \
+       caribou-autostart.desktop.in                                    \
+       $(NULL)
 desktop_DATA = orca-autostart.desktop                                  \
-              caribou-autostart.desktop                                \
+              $(desktop_in_files:.desktop.in=.desktop)                 \
               $(NULL)
 
 EXTRA_DIST =                                                           \
+       $(desktop_in_files)                                             \
        $(desktop_DATA)                                                 \
        $(NULL)
 
+DISTCLEANFILES =                                                       \
+       $(desktop_in_files:.desktop.in=.desktop)                        \
+       $(NULL)
+
 MAINTAINERCLEANFILES =                                                 \
         *~                                                             \
         Makefile.in
diff --git a/data/autostart/caribou-autostart.desktop b/data/autostart/caribou-autostart.desktop.in
similarity index 86%
rename from data/autostart/caribou-autostart.desktop
rename to data/autostart/caribou-autostart.desktop.in
index fcc5f7c..38b3fc6 100644
--- a/data/autostart/caribou-autostart.desktop
+++ b/data/autostart/caribou-autostart.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
 Name=Caribou
-Exec=caribou
+Exec= LIBEXECDIR@/caribou
 AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-keyboard-enabled
 X-GNOME-AutoRestart=true