diff options
| author | Stef Walter <stef@memberwebs.com> | 2010-06-20 23:34:49 +0000 |
|---|---|---|
| committer | Stef Walter <stef@memberwebs.com> | 2010-06-28 14:09:07 +0000 |
| commit | dec880cbef02b00de4701b4c0670cf3eab91a150 (patch) | |
| tree | 99a58cacd2854c24d453c9def796492be4308fd1 /daemon/Makefile.am | |
| parent | 3713f95277e2d7a1c587d229700f25e6886b8ac4 (diff) | |
| download | gnome-keyring-dec880cbef02b00de4701b4c0670cf3eab91a150.tar.gz | |
Fix building of desktop and service files.
* Use proper full paths.
* Don't use proprietary gmake extensions.
Diffstat (limited to 'daemon/Makefile.am')
| -rw-r--r-- | daemon/Makefile.am | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 1a2d3c26..d8faeca3 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -50,25 +50,14 @@ gnome_keyring_daemon_LDADD = \ $(GOBJECT_LIBS) \ $(GLIB_LIBS) -EXTRA_DIST = \ +service_in_files = \ org.gnome.keyring.service.in \ - org.freedesktop.secrets.service.in \ - $(desktop_in_files) - -CLEANFILES = \ - org.gnome.keyring.service \ - org.freedesktop.secrets.service \ - $(desktop_DATA) + org.freedesktop.secrets.service.in servicedir = $(DBUS_SERVICES_DIR) -service_in_files = org.gnome.keyring.service.in org.freedesktop.secrets.service.in service_DATA = $(service_in_files:.service.in=.service) service_PATH = $(VALGRIND_RUN)$(bindir) -# Rule to make the service file with bindir expanded -%.service: %.service.in Makefile - @sed -e "s|\@PATH\@|$(service_PATH)|" $< > $@ - desktop_in_files = \ gnome-keyring-pkcs11.desktop.in \ gnome-keyring-secrets.desktop.in \ @@ -76,4 +65,12 @@ desktop_in_files = \ desktopdir = $(sysconfdir)/xdg/autostart desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +EXTRA_DIST = \ + $(service_in_files) \ + $(desktop_in_files) + +CLEANFILES = \ + $(service_DATA) \ + $(desktop_DATA) + @INTLTOOL_DESKTOP_RULE@ |