use libexecdir for service binaries
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
parent
bed78ccd63
commit
304db5da3d
4
Makefile
4
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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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 $@
|
||||
|
|
|
@ -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%
|
||||
|
|
|
@ -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]
|
||||
|
|
Loading…
Reference in New Issue