diff options
| author | Regis Merlino <regis.merlino@intel.com> | 2013-06-04 11:43:28 +0200 |
|---|---|---|
| committer | Regis Merlino <regis.merlino@intel.com> | 2013-06-05 17:04:52 +0200 |
| commit | 06d6102d052cc74d4110e22e190d5d18555f672e (patch) | |
| tree | 7f74e52efeedfbd357518561addcb5c79767e3f8 /server | |
| parent | 062d0e262866f8216e294acb4959a6c4e5d4d2a1 (diff) | |
| download | dleyna-server-06d6102d052cc74d4110e22e190d5d18555f672e.tar.gz | |
[Build] Install the .service file in $(datadir)/dbus-1/services
Port of commits:
https://github.com/01org/dleyna-renderer/commit/d1c84c820ce180eabb57b83da3569a4de24c3ac4
https://github.com/01org/dleyna-renderer/commit/6981acf20cadec8a9c29e0096d16c2062d19a384
Calling `pkg-config --variable=session_bus_services_dir dbus-1` under
JHBuild results in the system-installed dbus-1.pc being parsed and
our .service file will be put under the /usr prefix instead of the
JHBuild one.
To avoid that, take $(datadir) in account and install it under
$(datadir)/dbus-1/services by default like other packages do (eg.
gvfs).
For those with different needs a --with-dbus-service-dir configure flag
is provided.
Signed-off-by: Regis Merlino <regis.merlino@intel.com>
Diffstat (limited to 'server')
| -rw-r--r-- | server/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/Makefile.am b/server/Makefile.am index 01821d6..9730498 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -15,11 +15,11 @@ dleyna_server_service_LDADD = $(GLIB_LIBS) \ $(DLEYNA_CORE_LIBS) \ $(top_builddir)/libdleyna/server/libdleyna-server-1.0.la -dbussessiondir = @DBUS_SESSION_DIR@ -dbussession_DATA = com.intel.dleyna-server.service +dbusservicedir = $(DBUS_SERVICE_DIR) +dbusservice_DATA = com.intel.dleyna-server.service pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = dleyna-server-service-1.0.pc -CLEANFILES = $(dbussession_DATA) $(pkgconfig_DATA) -DISTCLEANFILES = $(dbussession_DATA) $(pkgconfig_DATA) +CLEANFILES = $(dbusservice_DATA) +DISTCLEANFILES = $(pkgconfig_DATA) |