diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-04-11 15:09:13 +0000 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-04-11 15:09:13 +0000 |
| commit | a961af8441644304c3046556ad30ab724f2a4e0a (patch) | |
| tree | 790fab39d38b921ecd60e002fd6498ac2019fd27 | |
| parent | 428b1049b2283dad5e96aa367ad7baa28515d4bb (diff) | |
| download | empathy-a961af8441644304c3046556ad30ab724f2a4e0a.tar.gz | |
Do not autostart with session. Fixes bug #525039 (Frederic Peters).
svn path=/trunk/; revision=928
| -rw-r--r-- | data/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index a2f328534..bc225fc34 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -17,9 +17,9 @@ profile_DATA = \ sipphone.profile \ groupwise.profile -autostartdir = $(sysconfdir)/xdg/autostart -autostart_in_files = empathy.desktop.in -autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) +desktopdir = $(datadir)/applications +desktop_in_files = empathy.desktop.in +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ schemasdir = $(GCONF_SCHEMA_FILE_DIR) @@ -40,12 +40,12 @@ endif EXTRA_DIST = \ $(profile_DATA) \ - $(autostart_in_files) \ - $(autostart_DATA) \ + $(desktop_in_files) \ + $(desktop_DATA) \ $(schemas_in_files) \ $(schemas_DATA) DISTCLEANFILES = \ - $(autostart_DATA) \ + $(desktop_DATA) \ $(schemas_DATA) |