diff --git a/Makefile b/Makefile index 8e4783b..8572710 100644 --- a/Makefile +++ b/Makefile @@ -104,15 +104,15 @@ install-sysconfig: $(pck_sysconfig) install-scripts: $(pck_scripts) @echo "installing logrotate file...";\ - $(INSTALL_DIR) $(DESTDIR)$(sbin) - $(INSTALL_SCRIPT) $^ $(DESTDIR)$(sbin) - $(INSTALL_SCRIPT) scripts/update-alternatives-set-dri $(DESTDIR)$(sbin) - sed -i "s|@LIBDIR@|$(libdir)|" $(DESTDIR)$(sbin)/update-alternatives-set-dri + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_SCRIPT) $^ $(DESTDIR)$(sbindir) + $(INSTALL_SCRIPT) scripts/update-alternatives-set-dri $(DESTDIR)$(sbindir) + sed -i "s|@LIBDIR@|$(libdir)|" $(DESTDIR)$(sbindir)/update-alternatives-set-dri install-programs: install-plugins install-scripts install-defs @echo "installing $(PACKAGE)..." - @$(INSTALL_DIR) $(DESTDIR)$(sbin) - $(INSTALL_SCRIPT) $(pck_postplug) $(DESTDIR)$(sbin)/$(PACKAGE) + @$(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_SCRIPT) $(pck_postplug) $(DESTDIR)$(sbindir)/$(PACKAGE) $(INSTALL_DIR) $(DESTDIR)$(postplugnewdir) install: \ @@ -124,7 +124,7 @@ install: \ install-udev-files uninstall: - rm -f $(DESTDIR)$(sbin)/$(PACKAGE) + rm -f $(DESTDIR)$(sbindir)/$(PACKAGE) for f in $(notdir $(pck_plugins)); do\ rm -f $(DESTDIR)$(postplugdir)/$${f##[0-9][0-9]};\ rm -f $(DESTDIR)$(postplugrcdir)/$$f;\ diff --git a/postplug/postplug-service b/postplug/postplug-service index 4afa8cc..b72e42a 100644 --- a/postplug/postplug-service +++ b/postplug/postplug-service @@ -7,7 +7,7 @@ Before=sysinit.target [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/sbin/postplug +ExecStart=/usr/sbin/postplug TimeoutSec=90 [Install]