From 20f394a208e7db0b0a4330430930385e377cbc5c Mon Sep 17 00:00:00 2001
From: Alexey Avramov <hakavlad@gmail.com>
Date: Sun, 28 Jun 2020 19:50:05 +0900
Subject: [PATCH] replace $LOGDIR by /var/log

---
 Makefile               | 11 ++++-------
 docs/nohang.manpage.md |  2 +-
 man/nohang.8           |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index c4963cf..f0b8fd7 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,6 @@ PREFIX ?=         /usr/local
 SYSCONFDIR ?=     /usr/local/etc
 SYSTEMDUNITDIR ?= /usr/local/lib/systemd/system
 
-LOGDIR ?=           /var/log
-LOGROTATECONFDIR ?= /etc/logrotate.d
-
 BINDIR ?=  $(PREFIX)/bin
 SBINDIR ?= $(PREFIX)/sbin
 DATADIR ?= $(PREFIX)/share
@@ -60,8 +57,8 @@ base:
 	rm -fv nohang-desktop.conf
 	rm -fv version
 
-	install -d $(DESTDIR)$(LOGROTATECONFDIR)
-	install -m0644 conf/logrotate.d/nohang $(DESTDIR)$(LOGROTATECONFDIR)/nohang
+	install -d $(DESTDIR)/etc/logrotate.d
+	install -m0644 conf/logrotate.d/nohang $(DESTDIR)/etc/logrotate.d/nohang
 
 	install -d $(DESTDIR)$(MANDIR)/man1
 	gzip -9cn man/oom-sort.1 > $(DESTDIR)$(MANDIR)/man1/oom-sort.1.gz
@@ -135,9 +132,9 @@ uninstall-base:
 
 	rm -fv $(DESTDIR)$(MANDIR)/man8/nohang.8.gz
 
-	rm -fvr $(DESTDIR)$(LOGROTATECONFDIR)/nohang
+	rm -fvr $(DESTDIR)$/etc/logrotate.d/nohang
 	rm -fvr $(DESTDIR)$(DOCDIR)/
-	rm -fvr $(DESTDIR)$(LOGDIR)/nohang/
+	rm -fvr $(DESTDIR)/var/log/nohang/
 	rm -fvr $(DESTDIR)$(DATADIR)/nohang/
 	rm -fvr $(DESTDIR)$(SYSCONFDIR)/nohang/
 
diff --git a/docs/nohang.manpage.md b/docs/nohang.manpage.md
index bef81ef..3050378 100644
--- a/docs/nohang.manpage.md
+++ b/docs/nohang.manpage.md
@@ -61,7 +61,7 @@ path to file with *default* nohang.conf values
 #### $DATADIR/nohang/nohang-desktop.conf
 path to file with *default* nohang-desktop.conf values
 
-#### $LOGDIR/nohang/nohang.log
+#### /var/log/nohang/nohang.log
 optional log file that stores entries if separate_log=True in the config
 
 #### /etc/logrotate.d/nohang
diff --git a/man/nohang.8 b/man/nohang.8
index 52be56c..5fcf7ea 100644
--- a/man/nohang.8
+++ b/man/nohang.8
@@ -72,7 +72,7 @@ path to file with \f[I]default\f[] nohang.conf values
 .SS $DATADIR/nohang/nohang\-desktop.conf
 .PP
 path to file with \f[I]default\f[] nohang\-desktop.conf values
-.SS $LOGDIR/nohang/nohang.log
+.SS /var/log/nohang/nohang.log
 .PP
 optional log file that stores entries if separate_log=True in the config
 .SS /etc/logrotate.d/nohang