diff options
| author | Rico Tzschichholz <ricotz@t-online.de> | 2011-12-21 13:56:09 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@t-online.de> | 2011-12-21 13:56:09 +0100 |
| commit | f3feab498aaa94125094b0d098281e3bd4eaf08d (patch) | |
| tree | 5e60fa35e1a340898db22361d9fb0ad6af9f13e4 | |
| parent | c2f2ac41ddd5eac3dd8d163f28896c8e0b855851 (diff) | |
| download | gnome-settings-daemon-f3feab498aaa94125094b0d098281e3bd4eaf08d.tar.gz | |
Fix make dist for gnome-settings-daemon.desktop.in.in
This fixes 93f42f5305f8f3e4f58f6e0bafbad6de95347e8b causing
to ship a pre-generated gnome-settings-daemon.desktop.in which
prevents adjusting the libexec path since g-s-d.desktop.in doen't
get rebuilt.
| -rw-r--r-- | data/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index db9b612e..09f81bf3 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 -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +desktop_in_files = gnome-settings-daemon.desktop.in.in +desktop_DATA = $(desktop_in_files:.desktop.in.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,7 +68,6 @@ 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) \ |