From 569066715e99af4bcfaedbece6c30b3f9a01479b Mon Sep 17 00:00:00 2001
From: Christoffer Sandberg <cs@tuxedo.de>
Date: Fri, 17 Apr 2020 12:17:13 +0200
Subject: [PATCH] Update readme and manual dkms installation helper cmds

---
 Makefile  | 18 +++++++++---------
 README.md | 30 +++++++++---------------------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/Makefile b/Makefile
index 32b2a28..69e2631 100644
--- a/Makefile
+++ b/Makefile
@@ -30,22 +30,22 @@ clean:
 install:
 	make -C $(KDIR) M=$(PWD) modules_install
 
-dkmsadd:
-	cp -R . /usr/src/tuxedo_keyboard-2.0.0
-	dkms add -m tuxedo_keyboard -v 2.0.0
+# Package version and name from dkms.conf
+VER := $(shell sed -n 's/^PACKAGE_VERSION=\([^\n]*\)/\1/p' dkms.conf)
+MODULE_NAME := $(shell sed -n 's/^PACKAGE_NAME=\([^\n]*\)/\1/p' dkms.conf)
+
+dkmsinstall:
+	cp -R . /usr/src/$(MODULE_NAME)-$(VER)
+	dkms install -m $(MODULE_NAME) -v $(VER)
 
 dkmsremove:
-	dkms remove -m tuxedo_keyboard -v 2.0.0 --all
-	rm -rf /usr/src/tuxedo_keyboard-2.0.0
+	dkms remove -m $(MODULE_NAME) -v $(VER) --all
+	rm -rf /usr/src/$(MODULE_NAME)-$(VER)
 
 # --------------
 # Packaging only
 # ---------------
 
-# Package version and name from dkms.conf
-VER := $(shell sed -n 's/^PACKAGE_VERSION=\([^\n]*\)/\1/p' dkms.conf)
-MODULE_NAME := $(shell sed -n 's/^PACKAGE_NAME=\([^\n]*\)/\1/p' dkms.conf)
-
 DEB_PACKAGE_NAME := $(MODULE_NAME)-$(VER)
 
 # Deb package folder variables
diff --git a/README.md b/README.md
index 0b999f7..19c53ce 100644
--- a/README.md
+++ b/README.md
@@ -35,13 +35,15 @@ For convenience, on platforms where DKMS is in use, skip to the DKMS section dir
 
 ```sh
 git clone https://github.com/tuxedocomputers/tuxedo-keyboard.git
+
+cd tuxedo-keyboard
+
+git checkout release
 ```
 
 ## Build the Module:
 
 ```sh
-cd tuxedo-keyboard
-
 make clean && make
 ```
 
@@ -49,25 +51,11 @@ make clean && make
 
 ### Add as DKMS Module:
 
-Add the Module:
+Install the Module:
 ```sh
 make clean
 
-sudo mkdir /usr/src/tuxedo-keyboard-2.0.0/
-
-sudo cp -R . /usr/src/tuxedo-keyboard-2.0.0/
-
-sudo dkms add -m tuxedo-keyboard -v 2.0.0
-```
-
-Compile the Module:
-```sh
-sudo dkms build -m tuxedo-keyboard -v 2.0.0
-```
-
-Install the Module:
-```sh
-sudo dkms install -m tuxedo-keyboard -v 2.0.0
+sudo make dkmsinstall
 ```
 
 Load the Module with modprobe:
@@ -83,9 +71,7 @@ sudo modprobe tuxedo_keyboard
 
 Remove the DKMS module and source:
 ```sh
-sudo dkms remove -m tuxedo-keyboard -v 2.0.0 --all
-
-sudo rm -rf /usr/src/tuxedo-keyboard-2.0.0
+sudo make dkmsremove
 
 sudo rm /etc/modprobe.d/tuxedo_keyboard.conf
 ```
@@ -100,6 +86,8 @@ modprobe tuxedo_keyboard
 
 ## Load the Module on boot:
 
+If the module is relevant it will be loaded automatically on boot. If it is not loaded after a reboot, it most likely means that it is not needed.
+
 Add Module to /etc/modules
 ```sh
 sudo su