diff options
| author | Emanuele Aina <emanuele.aina@collabora.com> | 2013-05-06 15:31:34 +0100 |
|---|---|---|
| committer | Emanuele Aina <emanuele.aina@collabora.com> | 2013-05-07 15:35:46 +0100 |
| commit | 8179084be7b32f187e9ab4d79a24efa668a6df71 (patch) | |
| tree | 7d10661bc2d3cd08254d1edb03e1a3cb3c48c02f | |
| parent | 9877edf8110cc7b5a4e12251134beee839b649e2 (diff) | |
| download | dleyna-renderer-8179084be7b32f187e9ab4d79a24efa668a6df71.tar.gz | |
[Build] Do not assume libexec=@prefix@/libexec
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: Emanuele Aina <emanuele.aina@collabora.com>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | server/Makefile.am | 5 | ||||
| -rw-r--r-- | server/com.intel.dleyna-renderer.service.in | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 4b09da3..2cbf483 100644 --- a/configure.ac +++ b/configure.ac @@ -240,7 +240,6 @@ AC_CONFIG_FILES([Makefile \ libdleyna/renderer/Makefile \ libdleyna/renderer/dleyna-renderer-1.0.pc \ libdleyna/renderer/dleyna-renderer-service.conf \ - server/com.intel.dleyna-renderer.service \ server/dleyna-renderer-service-1.0.pc \ server/Makefile ]) diff --git a/server/Makefile.am b/server/Makefile.am index 72ef477..b321bca 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -16,8 +16,13 @@ dleyna_renderer_service_LDADD = $(GLIB_LIBS) \ $(top_builddir)/libdleyna/renderer/libdleyna-renderer-1.0.la dbusservicedir = $(DBUS_SERVICE_DIR) +dbusservice_in_files = com.intel.dleyna-renderer.service.in dbusservice_DATA = com.intel.dleyna-renderer.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-renderer-service-1.0.pc diff --git a/server/com.intel.dleyna-renderer.service.in b/server/com.intel.dleyna-renderer.service.in index 77907af..081785e 100644 --- a/server/com.intel.dleyna-renderer.service.in +++ b/server/com.intel.dleyna-renderer.service.in @@ -1,4 +1,3 @@ [D-BUS Service] Name=com.intel.dleyna-renderer -Exec=@prefix@/libexec/dleyna-renderer-service - +Exec=@libexecdir@/dleyna-renderer-service |