diff --git a/Makefile b/Makefile index ca18606..5a7e7fb 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ DESTDIR ?= -PREFIX ?= /usr/local -SYSCONFDIR ?= /usr/local/etc -SYSTEMDUNITDIR ?= /usr/local/lib/systemd/system +PREFIX ?= /usr/local +SYSCONFDIR ?= /usr/local/etc +SYSTEMDUNITDIR ?= /usr/local/lib/systemd/system LOGDIR ?= /var/log LOGROTATECONFDIR ?= /etc/logrotate.d @@ -31,7 +31,6 @@ install: install -d $(DESTDIR)$(DATADIR)/nohang install -m0644 nohang/nohang.conf $(DESTDIR)$(DATADIR)/nohang/nohang.conf install -m0644 nohang/nohang-desktop.conf $(DESTDIR)$(DATADIR)/nohang/nohang-desktop.conf - -git describe --tags --long --dirty > version -install -m0644 version $(DESTDIR)$(DATADIR)/nohang/version -rm -fv version @@ -50,8 +49,8 @@ install: install -m0644 nohang/nohang.logrotate $(DESTDIR)$(LOGROTATECONFDIR)/nohang -install -d $(DESTDIR)$(SYSTEMDUNITDIR) - env BINDIR=$(BINDIR) SYSCONFDIR=$(SYSCONFDIR) envsubst < nohang/nohang.service.in > nohang.service - env BINDIR=$(BINDIR) SYSCONFDIR=$(SYSCONFDIR) envsubst < nohang/nohang-desktop.service.in > nohang-desktop.service + -sed "s|:TARGET_SBINDIR:|$(SBINDIR)|g;s|:TARGET_SYSCONFDIR:|$(SYSCONFDIR)|g" nohang/nohang.service.in > nohang.service + -sed "s|:TARGET_SBINDIR:|$(SBINDIR)|g;s|:TARGET_SYSCONFDIR:|$(SYSCONFDIR)|g" nohang/nohang-desktop.service.in > nohang-desktop.service -install -m0644 nohang.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service -install -m0644 nohang-desktop.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang-desktop.service -rm -fv nohang.service @@ -77,7 +76,6 @@ build_deb: install -d $(DESTDIR)$(DATADIR)/nohang install -m0644 nohang/nohang.conf $(DESTDIR)$(DATADIR)/nohang/nohang.conf install -m0644 nohang/nohang-desktop.conf $(DESTDIR)$(DATADIR)/nohang/nohang-desktop.conf - -git describe --tags --long --dirty > version -install -m0644 version $(DESTDIR)$(DATADIR)/nohang/version -rm -fv version @@ -96,8 +94,8 @@ build_deb: install -m0644 nohang/nohang.logrotate $(DESTDIR)$(LOGROTATECONFDIR)/nohang -install -d $(DESTDIR)$(SYSTEMDUNITDIR) - env BINDIR=$(BINDIR) SYSCONFDIR=$(SYSCONFDIR) envsubst < nohang/nohang.service.in > nohang.service - env BINDIR=$(BINDIR) SYSCONFDIR=$(SYSCONFDIR) envsubst < nohang/nohang-desktop.service.in > nohang-desktop.service + -sed "s|:TARGET_SBINDIR:|$(SBINDIR)|g;s|:TARGET_SYSCONFDIR:|$(SYSCONFDIR)|g" nohang/nohang.service.in > nohang.service + -sed "s|:TARGET_SBINDIR:|$(SBINDIR)|g;s|:TARGET_SYSCONFDIR:|$(SYSCONFDIR)|g" nohang/nohang-desktop.service.in > nohang-desktop.service -install -m0644 nohang.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service -install -m0644 nohang-desktop.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang-desktop.service -rm -fv nohang.service diff --git a/README.md b/README.md index 59555ca..3330b23 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ $ sudo systemctl enable --now nohang-desktop Install build dependencies: ```bash -$ sudo apt install make fakeroot gettext +$ sudo apt install make fakeroot ``` Clone latest git snapshot and run build script to build deb package: diff --git a/nohang/nohang-desktop.service.in b/nohang/nohang-desktop.service.in index 258bc6a..5758507 100644 --- a/nohang/nohang-desktop.service.in +++ b/nohang/nohang-desktop.service.in @@ -5,7 +5,7 @@ Conflicts=nohang.service After=system.slice [Service] -ExecStart=${BINDIR}/nohang --config ${CONFDIR}/nohang/nohang-desktop.conf --monitor +ExecStart=:TARGET_SBINDIR:/nohang --monitor --config :TARGET_SYSCONFDIR:/nohang/nohang-desktop.conf SyslogIdentifier=nohang-desktop KillMode=mixed Restart=always diff --git a/nohang/nohang.service.in b/nohang/nohang.service.in index f886c25..b880ad7 100644 --- a/nohang/nohang.service.in +++ b/nohang/nohang.service.in @@ -5,7 +5,7 @@ Conflicts=nohang-desktop.service After=system.slice [Service] -ExecStart=${BINDIR}/nohang --config ${CONFDIR}/nohang/nohang.conf --monitor +ExecStart=:TARGET_SBINDIR:/nohang --monitor --config :TARGET_SYSCONFDIR:/nohang/nohang.conf SyslogIdentifier=nohang KillMode=mixed Restart=always