From 4c800e8ade1910bd5b8566ee80f224b1acd8a2e6 Mon Sep 17 00:00:00 2001
From: Alexey Avramov <hakavlad@gmail.com>
Date: Sat, 2 May 2020 20:56:54 +0900
Subject: [PATCH] Fix Makefile for compliance `man hier`

---
 Makefile      | 23 +++++++++++------------
 deb/build.sh  |  7 ++++++-
 nohang/nohang | 11 +++++++----
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 6e481b1..bc79ba6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,16 @@
 DESTDIR ?=
-BINDIR ?= /usr/local/bin
-CONFDIR ?= /etc
-MANDIR ?= /usr/share/man/man1
-LOGDIR ?= /var/log
-SYSTEMDUNITDIR ?= /etc/systemd/system
+BINDIR ?=           /usr/local/bin
+CONFDIR ?=          /usr/local/etc
+SYSTEMDUNITDIR ?=   /usr/local/lib/systemd/system
+MANDIR ?=           /usr/local/share/man/man1
+LOGDIR ?=           /var/log
+LOGROTATECONFDIR ?= /etc/logrotate.d
 
 all:
 	@ echo "Use: make install, build_deb, make uninstall"
 
 install:
 	install -d $(DESTDIR)$(BINDIR)
-
 	install -m0755 nohang/nohang $(DESTDIR)$(BINDIR)/nohang
 	install -m0755 tools/oom-sort $(DESTDIR)$(BINDIR)/oom-sort
 	install -m0755 tools/psi-top $(DESTDIR)$(BINDIR)/psi-top
@@ -28,8 +28,8 @@ install:
 	install -m0644 nohang/nohang.conf $(DESTDIR)$(CONFDIR)/nohang/defaults/nohang.conf
 	install -m0644 nohang/nohang-desktop.conf $(DESTDIR)$(CONFDIR)/nohang/defaults/nohang-desktop.conf
 
-	install -d $(DESTDIR)$(CONFDIR)/logrotate.d
-	install -m0644 nohang/nohang.logrotate $(DESTDIR)$(CONFDIR)/logrotate.d/nohang
+	install -d $(DESTDIR)$(LOGROTATECONFDIR)
+	install -m0644 nohang/nohang.logrotate $(DESTDIR)$(LOGROTATECONFDIR)/nohang
 
 	install -d $(DESTDIR)$(MANDIR)
 	gzip -c nohang/nohang.1 > $(DESTDIR)$(MANDIR)/nohang.1.gz
@@ -50,7 +50,6 @@ install:
 
 build_deb:
 	install -d $(DESTDIR)$(BINDIR)
-
 	install -m0755 nohang/nohang $(DESTDIR)$(BINDIR)/nohang
 	install -m0755 tools/oom-sort $(DESTDIR)$(BINDIR)/oom-sort
 	install -m0755 tools/psi-top $(DESTDIR)$(BINDIR)/psi-top
@@ -68,8 +67,8 @@ build_deb:
 	install -m0644 nohang/nohang.conf $(DESTDIR)$(CONFDIR)/nohang/defaults/nohang.conf
 	install -m0644 nohang/nohang-desktop.conf $(DESTDIR)$(CONFDIR)/nohang/defaults/nohang-desktop.conf
 
-	install -d $(DESTDIR)$(CONFDIR)/logrotate.d
-	install -m0644 nohang/nohang.logrotate $(DESTDIR)$(CONFDIR)/logrotate.d/nohang
+	install -d $(DESTDIR)$(LOGROTATECONFDIR)
+	install -m0644 nohang/nohang.logrotate $(DESTDIR)$(LOGROTATECONFDIR)/nohang
 
 	install -d $(DESTDIR)$(MANDIR)
 	gzip -c nohang/nohang.1 > $(DESTDIR)$(MANDIR)/nohang.1.gz
@@ -103,5 +102,5 @@ uninstall:
 	rm -fv $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service
 	rm -fv $(DESTDIR)$(SYSTEMDUNITDIR)/nohang-desktop.service
 	rm -fvr $(DESTDIR)$(CONFDIR)/nohang/
-	rm -fvr $(DESTDIR)$(CONFDIR)/logrotate.d/nohang
+	rm -fvr $(DESTDIR)$(LOGROTATECONFDIR)/nohang
 	rm -fvr $(DESTDIR)$(LOGDIR)/nohang/
diff --git a/deb/build.sh b/deb/build.sh
index a8020a4..4aff445 100755
--- a/deb/build.sh
+++ b/deb/build.sh
@@ -1,6 +1,11 @@
 #!/bin/sh -v
 mkdir deb/package
-make build_deb DESTDIR=deb/package BINDIR=/usr/bin SYSTEMDUNITDIR=/lib/systemd/system
+make build_deb \
+	DESTDIR=deb/package \
+	BINDIR=/usr/bin \
+	CONFDIR=/etc \
+	SYSTEMDUNITDIR=/lib/systemd/system \
+	MANDIR=/usr/share/man/man1
 cd deb
 cp -r DEBIAN package/
 fakeroot dpkg-deb --build package
diff --git a/nohang/nohang b/nohang/nohang
index d302b30..c28b2f0 100755
--- a/nohang/nohang
+++ b/nohang/nohang
@@ -775,10 +775,13 @@ def log(*msg):
 def print_version():
     """
     """
-    try:
-        v = rline1('/etc/nohang/version')
-    except FileNotFoundError:
-        v = None
+    if os.path.exists('/usr/local/etc/nohang/version'):
+        v = rline1('/usr/local/etc/nohang/version')
+    else:
+        try:
+            v = rline1('/etc/nohang/version')
+        except FileNotFoundError:
+            v = None
     if v is None:
         print('nohang unknown version')
     else: