diff options
| -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 e799836..8421139 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 |