diff options
| author | Kalev Lember <kalevlember@gmail.com> | 2014-09-12 23:31:03 +0200 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2014-09-17 08:24:03 -0400 |
| commit | 38108969ee895036d30012576bf27d9877beaa59 (patch) | |
| tree | 1faa0bc3dbacb6eb0b694b5784ec824fb3c4a909 | |
| parent | 3760fa4c3038018fd85603eaa9fe5356ffb9a352 (diff) | |
| download | gdm-38108969ee895036d30012576bf27d9877beaa59.tar.gz | |
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
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | data/autostart/Makefile.am | 13 | ||||
| -rw-r--r-- | data/autostart/caribou-autostart.desktop.in (renamed from data/autostart/caribou-autostart.desktop) | 2 |
3 files changed, 14 insertions, 2 deletions
@@ -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 ab7bcd9d..d6696b53 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 index fcc5f7c6..38b3fc66 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 |