diff options
| author | Regis Merlino <regis.merlino@intel.com> | 2013-06-04 11:57:58 +0200 |
|---|---|---|
| committer | Regis Merlino <regis.merlino@intel.com> | 2013-06-05 17:13:33 +0200 |
| commit | 66f50505563ed524f1f915775f3828bd73215522 (patch) | |
| tree | 88b0ea6f3fe2c38be9a954dd19b08686a44845dd | |
| parent | b391e62f1203a6faf70ee1bf8478472921ed96aa (diff) | |
| download | dleyna-server-66f50505563ed524f1f915775f3828bd73215522.tar.gz | |
[Build] Do not assume libexec=@prefix@/libexec
This is a port of commits:
https://github.com/01org/dleyna-renderer/commit/8179084be7b32f187e9ab4d79a24efa668a6df71
https://github.com/01org/dleyna-renderer/commit/f3e9967b3c8f76b6d43320749b6e58e1a607d2a9
For instance, Debian Policy recommends that helper programs should be
installed under /usr/lib/${packagename}/ .
http://www.debian.org/doc/debian-policy/ch-sharedlibs.html#s-sharedlibs-support-files
Signed-off-by: Regis Merlino <regis.merlino@intel.com>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | server/Makefile.am | 9 | ||||
| -rw-r--r-- | server/com.intel.dleyna-server.service.in | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 19d336f..d454cb4 100644 --- a/configure.ac +++ b/configure.ac @@ -234,7 +234,6 @@ AC_CONFIG_FILES([Makefile \ libdleyna/server/Makefile \ libdleyna/server/dleyna-server-1.0.pc \ libdleyna/server/dleyna-server-service.conf \ - server/com.intel.dleyna-server.service \ server/dleyna-server-service-1.0.pc \ server/Makefile \ test/dbus/Makefile diff --git a/server/Makefile.am b/server/Makefile.am index 9730498..ad8a7b7 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -16,10 +16,17 @@ dleyna_server_service_LDADD = $(GLIB_LIBS) \ $(top_builddir)/libdleyna/server/libdleyna-server-1.0.la dbusservicedir = $(DBUS_SERVICE_DIR) +dbusservice_in_files = com.intel.dleyna-server.service.in dbusservice_DATA = com.intel.dleyna-server.service +# Replace the 'libexecdir' marker with its fully expanded value +%.service: %.service.in Makefile + $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = dleyna-server-service-1.0.pc +EXTRA_DIST = $(dbusservice_in_files) + CLEANFILES = $(dbusservice_DATA) -DISTCLEANFILES = $(pkgconfig_DATA) +DISTCLEANFILES = $(dbusservice_DATA) diff --git a/server/com.intel.dleyna-server.service.in b/server/com.intel.dleyna-server.service.in index b81e6cd..68014c0 100644 --- a/server/com.intel.dleyna-server.service.in +++ b/server/com.intel.dleyna-server.service.in @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.intel.dleyna-server -Exec=@prefix@/libexec/dleyna-server-service +Exec=@libexecdir@/dleyna-server-service |