Install binaries under /usr/sbin instead of /sbin

This commit is contained in:
Silvan Calarco 2017-12-20 13:01:31 +01:00
parent 67ba1a18c3
commit f8cf76e577
2 changed files with 8 additions and 8 deletions

View File

@ -104,15 +104,15 @@ install-sysconfig: $(pck_sysconfig)
install-scripts: $(pck_scripts) install-scripts: $(pck_scripts)
@echo "installing logrotate file...";\ @echo "installing logrotate file...";\
$(INSTALL_DIR) $(DESTDIR)$(sbin) $(INSTALL_DIR) $(DESTDIR)$(sbindir)
$(INSTALL_SCRIPT) $^ $(DESTDIR)$(sbin) $(INSTALL_SCRIPT) $^ $(DESTDIR)$(sbindir)
$(INSTALL_SCRIPT) scripts/update-alternatives-set-dri $(DESTDIR)$(sbin) $(INSTALL_SCRIPT) scripts/update-alternatives-set-dri $(DESTDIR)$(sbindir)
sed -i "s|@LIBDIR@|$(libdir)|" $(DESTDIR)$(sbin)/update-alternatives-set-dri sed -i "s|@LIBDIR@|$(libdir)|" $(DESTDIR)$(sbindir)/update-alternatives-set-dri
install-programs: install-plugins install-scripts install-defs install-programs: install-plugins install-scripts install-defs
@echo "installing $(PACKAGE)..." @echo "installing $(PACKAGE)..."
@$(INSTALL_DIR) $(DESTDIR)$(sbin) @$(INSTALL_DIR) $(DESTDIR)$(sbindir)
$(INSTALL_SCRIPT) $(pck_postplug) $(DESTDIR)$(sbin)/$(PACKAGE) $(INSTALL_SCRIPT) $(pck_postplug) $(DESTDIR)$(sbindir)/$(PACKAGE)
$(INSTALL_DIR) $(DESTDIR)$(postplugnewdir) $(INSTALL_DIR) $(DESTDIR)$(postplugnewdir)
install: \ install: \
@ -124,7 +124,7 @@ install: \
install-udev-files install-udev-files
uninstall: uninstall:
rm -f $(DESTDIR)$(sbin)/$(PACKAGE) rm -f $(DESTDIR)$(sbindir)/$(PACKAGE)
for f in $(notdir $(pck_plugins)); do\ for f in $(notdir $(pck_plugins)); do\
rm -f $(DESTDIR)$(postplugdir)/$${f##[0-9][0-9]};\ rm -f $(DESTDIR)$(postplugdir)/$${f##[0-9][0-9]};\
rm -f $(DESTDIR)$(postplugrcdir)/$$f;\ rm -f $(DESTDIR)$(postplugrcdir)/$$f;\

View File

@ -7,7 +7,7 @@ Before=sysinit.target
[Service] [Service]
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStart=/sbin/postplug ExecStart=/usr/sbin/postplug
TimeoutSec=90 TimeoutSec=90
[Install] [Install]