use libexecdir for service binaries

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/Makefile b/Makefile
index 35f13451fffb32a432d73c0b7523d024adeaaee5..6754b8b8a97862519163c7e62fbbf611c83d2f53 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ install: $(COMPILED_BINS)
        install -dm755 $(DESTDIR)$(SBINDIR)
        $(foreach i,$(USR_SBIN), \
            install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(SBINDIR)/ ;)
-       install -dm755 $(DESTDIR)$(LIBDIR)/proxmox-backup
+       install -dm755 $(DESTDIR)$(LIBEXECDIR)/proxmox-backup
        $(foreach i,$(SERVICE_BIN), \
-           install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(LIBDIR)/proxmox-backup/ ;)
+           install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/ ;)
        $(MAKE) -C www install

diff --git a/defines.mk b/defines.mk
index 4eaffdf9ef8cd61a043297e4393c08d7b9e2f236..0dcdfd896c5c0d386c510c7c1f31571383af814c 100644 (file)
--- a/defines.mk
+++ b/defines.mk
@@ -6,6 +6,7 @@ PREFIX := /usr
 BINDIR := $(PREFIX)/bin
 SBINDIR := $(PREFIX)/sbin
 LIBDIR := $(PREFIX)/lib
+LIBEXECDIR := $(LIBDIR)
 DATAROOTDIR := $(PREFIX)/share
 JSDIR := $(DATAROOTDIR)/javascript/proxmox-backup
 

diff --git a/etc/Makefile b/etc/Makefile
index 70e3a479d2b267c396b266b06c9c97ed149f8a99..da1f083b01544989bda744247033f123a5bac3e9 100644 (file)
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -12,7 +12,7 @@ clean:
 .SUFFIXES: .service.in .service
 .service.in.service:
        sed \
-           -e 's!%LIBDIR%!$(LIBDIR)!g' \
+           -e 's!%LIBEXECDIR%!$(LIBEXECDIR)!g' \
            -e 's!%PROXY_USER%!$(PROXY_USER)!g' \
            $< >$@.tmp
        mv $@.tmp $@

diff --git a/etc/proxmox-backup-proxy.service.in b/etc/proxmox-backup-proxy.service.in
index bbdf0f3108a056a444522eb938fc50070650d51f..0276ef342c7f3db5ac77198a747f9a63c3e80ca3 100644 (file)
--- a/etc/proxmox-backup-proxy.service.in
+++ b/etc/proxmox-backup-proxy.service.in
@@ -6,7 +6,7 @@ Requires=proxmox-backup.service
 
 [Service]
 Type=simple
-ExecStart=%LIBDIR%/proxmox-backup/proxmox-backup-proxy
+ExecStart=%LIBEXECDIR%/proxmox-backup/proxmox-backup-proxy
 Restart=on-failure
 User=%PROXY_USER%
 Group=%PROXY_USER%

diff --git a/etc/proxmox-backup.service.in b/etc/proxmox-backup.service.in
index b4c5846abd766bc03506b10ffdab55b6c2f21c7d..9ee45381b6c94e2c02a6a085be3ee8ecf517ef12 100644 (file)
--- a/etc/proxmox-backup.service.in
+++ b/etc/proxmox-backup.service.in
@@ -5,7 +5,7 @@ After=network.target syslog.target
 
 [Service]
 Type=simple
-ExecStart=%LIBDIR%/proxmox-backup/proxmox-backup-api
+ExecStart=%LIBEXECDIR%/proxmox-backup/proxmox-backup-api
 Restart=on-failure
 
 [Install]