Use systemd.pc to place systemd system units.

Patch by Chris Hofstaedtler. Useful in particular for merged-/usr systems.

diff --git a/Makefile.in b/Makefile.in
index 5f9f0534f7e11cf3a9cad3ff4b5c4dd832d63d71..5f7fbf48b46a1e5e363fd6d71efc689b1bdea262 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,6 +8,7 @@ CXXFLAGS=-Wall @CXXFLAGS@ @protobuf_CFLAGS@ @libsystemd_CFLAGS@ @libtomcrypt_CFL
 CFLAGS=-Wall @CFLAGS@
 LDFLAGS=@LDFLAGS@ -pthread
 LIBS=@LIBS@ @protobuf_LIBS@ @libsystemd_LIBS@ @libtomcrypt_LIBS@
+SYSTEMDSYSTEMUNITDIR=@SYSTEMDSYSTEMUNITDIR@
 
 OBJS=main.o client.o server.o stream.o udpstream.o serverpool.o input.o input_stats.o httpinput.o udpinput.o parse.o config.o acceptor.o stats.o accesslog.o thread.o util.o log.o metacube2.o sa_compare.o timespec.o state.pb.o tlse/tlse.o
 
@@ -49,7 +50,7 @@ install:
                $(DESTDIR)$(LOCALSTATEDIR)/lib/cubemap \
                $(DESTDIR)$(LOCALSTATEDIR)/log/cubemap \
                $(DESTDIR)$(PREFIX)/share/munin/plugins \
-               $(DESTDIR)/lib/systemd/system
+               $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
        $(INSTALL) -m 755 -o root -g root cubemap $(DESTDIR)$(PREFIX)/bin/cubemap
        $(INSTALL) -m 755 -o root -g root munin/cubemap munin/cubemap_input $(DESTDIR)$(PREFIX)/share/munin/plugins/
 ifeq (@have_ffmpeg@,yes)
@@ -59,7 +60,7 @@ endif
        sed \
                -e "s,@prefix[@],$(PREFIX),g" \
                -e "s,@sysconfdir[@],$(SYSCONFDIR),g" \
-               cubemap.service.in > $(DESTDIR)/lib/systemd/system/cubemap.service
+               cubemap.service.in > $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)/cubemap.service
        # Make sure we don't overwrite an existing configuration.
        test ! -f $(DESTDIR)$(SYSCONFDIR)/cubemap.config
        sed \

diff --git a/configure.ac b/configure.ac
index 189e45f03d94ff38d321a60c1ed1422549a54b75..9564ae9da57d59ebdba810f48f242445da9e761d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,7 @@ PKG_PROG_PKG_CONFIG
 PKG_CHECK_MODULES([libsystemd], [libsystemd])
 PKG_CHECK_MODULES([protobuf], [protobuf])
 PKG_CHECK_MODULES([libtomcrypt], [libtomcrypt])
+PKG_CHECK_VAR(SYSTEMDSYSTEMUNITDIR, systemd, systemdsystemunitdir)
 
 have_ffmpeg=yes
 PKG_CHECK_MODULES([libavformat], [libavformat], [true], [have_ffmpeg=no])