tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use libexecdir for service binaries

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-02-01 10:05:14 +01:00
parent bed78ccd63
commit 304db5da3d
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -83,7 +83,7 @@ install: $(COMPILED_BINS)
install -dm755 $(DESTDIR)$(SBINDIR) install -dm755 $(DESTDIR)$(SBINDIR)
$(foreach i,$(USR_SBIN), \ $(foreach i,$(USR_SBIN), \
install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(SBINDIR)/ ;) install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(SBINDIR)/ ;)
install -dm755 $(DESTDIR)$(LIBDIR)/proxmox-backup install -dm755 $(DESTDIR)$(LIBEXECDIR)/proxmox-backup
$(foreach i,$(SERVICE_BIN), \ $(foreach i,$(SERVICE_BIN), \
install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(LIBDIR)/proxmox-backup/ ;) install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/ ;)
$(MAKE) -C www install $(MAKE) -C www install

1
defines.mk
View File

@ -6,6 +6,7 @@ PREFIX := /usr
BINDIR := $(PREFIX)/bin BINDIR := $(PREFIX)/bin
SBINDIR := $(PREFIX)/sbin SBINDIR := $(PREFIX)/sbin
LIBDIR := $(PREFIX)/lib LIBDIR := $(PREFIX)/lib
LIBEXECDIR := $(LIBDIR)
DATAROOTDIR := $(PREFIX)/share DATAROOTDIR := $(PREFIX)/share
JSDIR := $(DATAROOTDIR)/javascript/proxmox-backup JSDIR := $(DATAROOTDIR)/javascript/proxmox-backup

2
etc/Makefile
View File

@ -12,7 +12,7 @@ clean:
.SUFFIXES: .service.in .service .SUFFIXES: .service.in .service
.service.in.service: .service.in.service:
sed \ sed \
-e 's!%LIBDIR%!$(LIBDIR)!g' \ -e 's!%LIBEXECDIR%!$(LIBEXECDIR)!g' \
-e 's!%PROXY_USER%!$(PROXY_USER)!g' \ -e 's!%PROXY_USER%!$(PROXY_USER)!g' \
$< >$@.tmp $< >$@.tmp
mv $@.tmp $@ mv $@.tmp $@

2
etc/proxmox-backup-proxy.service.in
View File

@ -6,7 +6,7 @@ Requires=proxmox-backup.service
[Service] [Service]
Type=simple Type=simple
ExecStart=%LIBDIR%/proxmox-backup/proxmox-backup-proxy ExecStart=%LIBEXECDIR%/proxmox-backup/proxmox-backup-proxy
Restart=on-failure Restart=on-failure
User=%PROXY_USER% User=%PROXY_USER%
Group=%PROXY_USER% Group=%PROXY_USER%

2
etc/proxmox-backup.service.in
View File

@ -5,7 +5,7 @@ After=network.target syslog.target
[Service] [Service]
Type=simple Type=simple
ExecStart=%LIBDIR%/proxmox-backup/proxmox-backup-api ExecStart=%LIBEXECDIR%/proxmox-backup/proxmox-backup-api
Restart=on-failure Restart=on-failure
[Install] [Install]