From 705bdc94712a2793b2b89c1e78fb15d7d6c82903 Mon Sep 17 00:00:00 2001
From: lash <dev@holbrook.no>
Date: Sat, 13 May 2023 21:05:04 +0100
Subject: [PATCH] Add man in packaging, add missing config dir in manifest

---
 MANIFEST.in |  2 +-
 Makefile    | 12 +++++++-----
 setup.cfg   |  3 ++-
 setup.py    |  7 ++++++-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 77d4b66..d1ed35c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1 @@
-include *requirements.txt LICENSE CHANGELOG WAIVER WAIVER.asc eth_monitor/data/config/*
+include *requirements.txt LICENSE CHANGELOG WAIVER WAIVER.asc eth_monitor/data/config/* man/build/*.1
diff --git a/Makefile b/Makefile
index 5f6c7c8..17d520c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,12 @@
 PREFIX ?= /usr/local
-BUILD_DIR = build/$(PREFIX)/share/man
+#BUILD_DIR = build/$(PREFIX)/share/man
+MAN_DIR = man
 
 man:
-	mkdir -vp $(BUILD_DIR)
-	chainlib-man.py -b 0xbf -v -n eth-monitor -d $(BUILD_DIR)/ man
-	chainlib-man.py -b 0xbf -v -n eth-monitor-list -d $(BUILD_DIR)/ man
-	chainlib-man.py -b 0xbf -v -n eth-monitor-import -d $(BUILD_DIR)/ man
+	mkdir -vp $(MAN_DIR)/build
+	chainlib-man.py -b 0xbf -v -n eth-monitor -d $(MAN_DIR)/build $(MAN_DIR)
+	cp -v $(MAN_DIR)/build/eth-monitor.1 $(MAN_DIR)/build/eth-monitor-sync.1
+	chainlib-man.py -b 0xbf -v -n eth-monitor-list -d $(MAN_DIR)/build $(MAN_DIR)
+	chainlib-man.py -b 0xbf -v -n eth-monitor-import -d $(MAN_DIR)/build $(MAN_DIR)
 
 .PHONY: man
diff --git a/setup.cfg b/setup.cfg
index 3e6381a..1ec76b5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = eth-monitor
-version = 0.7.3
+version = 0.7.4
 description = Monitor and cache transactions using match filters
 author = Louis Holbrook
 author_email = dev@holbrook.no
@@ -37,4 +37,5 @@ packages =
 
 [options.entry_points]
 console_scripts =
+	eth-monitor = eth_monitor.runnable.sync:main
 	eth-monitor-sync = eth_monitor.runnable.sync:main
diff --git a/setup.py b/setup.py
index c481db7..4ab86a6 100644
--- a/setup.py
+++ b/setup.py
@@ -21,8 +21,13 @@ while True:
     test_requirements.append(l.rstrip())
 f.close()
 
-
+man_dir = 'man/build'
 setup(
         install_requires=requirements,
         tests_require=test_requirements,
+        data_files=[("man/man1", [
+                os.path.join(man_dir, 'eth-monitor.1'),
+                os.path.join(man_dir, 'eth-monitor-sync.1'),
+            ]
+             )],
     )