From bed66ffa1f4ba554a0656ca7a30955ff40b72c03 Mon Sep 17 00:00:00 2001
From: Blake Harnden <32446120+bharnden@users.noreply.github.com>
Date: Sun, 29 Dec 2019 23:18:40 -0800
Subject: [PATCH] updates to main Makefile.am and install docs

---
 Makefile.am     | 12 ++----------
 docs/install.md |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a0b09165..fec08074 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,6 +65,7 @@ fpm -s dir -t rpm -n core \
 	-d "libev" \
 	-d "net-tools" \
 	-d "python3 >= 3.6" \
+	-d "python3-tkinter" \
 	-C $(DESTDIR)
 endef
 
@@ -91,6 +92,7 @@ fpm -s dir -t deb -n core \
 	-d "iproute2" \
 	-d "libev4" \
 	-d "python3 >= 3.6" \
+	-d "python3-tk" \
 	-C $(DESTDIR)
 endef
 
@@ -117,8 +119,6 @@ define change-files =
 $(info creating file $1 from $1.in)
 @$(SED) -e 's,[@]sbindir[@],$(sbindir),g' \
 	-e 's,[@]bindir[@],$(bindir),g' \
-	-e 's,[@]pythondir[@],$(pythondir),g' \
-	-e 's,[@]PYTHON[@],$(PYTHON),g' \
 	-e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \
 	-e 's,[@]PACKAGE_DATE[@],$(PACKAGE_DATE),g' \
 	-e 's,[@]CORE_LIB_DIR[@],$(CORE_LIB_DIR),g' \
@@ -126,14 +126,6 @@ $(info creating file $1 from $1.in)
 	-e 's,[@]CORE_DATA_DIR[@],$(CORE_DATA_DIR),g' \
 	-e 's,[@]CORE_CONF_DIR[@],$(CORE_CONF_DIR),g' \
 	-e 's,[@]CORE_GUI_CONF_DIR[@],$(CORE_GUI_CONF_DIR),g' \
-	-e 's,[@]sysctl_path[@],$(sysctl_path),g' \
-	-e 's,[@]ip_path[@],$(ip_path),g' \
-	-e 's,[@]tc_path[@],$(tc_path),g' \
-	-e 's,[@]ebtables_path[@],$(ebtables_path),g' \
-	-e 's,[@]mount_path[@],$(mount_path),g' \
-	-e 's,[@]umount_path[@],$(umount_path),g' \
-	-e 's,[@]ovs_vs_path[@],$(ovs_vs_path),g' \
-	-e 's,[@]ovs_of_path[@],$(ovs_of_path),g' \
 	< $1.in > $1
 endef
 
diff --git a/docs/install.md b/docs/install.md
index 64b0cdfd..5d3ee3b2 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -217,7 +217,7 @@ sudo pip3 install grpcio-tools
 ### Ubuntu 18.04 Requirements
 
 ```shell
-sudo apt install automake pkg-config gcc iproute2 libev-dev ebtables python3.6 python3.6-dev python3-pip tk libtk-img ethtool
+sudo apt install automake pkg-config gcc iproute2 libev-dev ebtables python3.6 python3.6-dev python3-pip tk libtk-img ethtool python3-tk
 ```
 
 ### Ubuntu 16.04 Requirements