diff --git a/Makefile b/Makefile index 35f13451..6754b8b8 100644 --- 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 4eaffdf9..0dcdfd89 100644 --- 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 70e3a479..da1f083b 100644 --- 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 bbdf0f31..0276ef34 100644 --- 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 b4c5846a..9ee45381 100644 --- 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]