Cleaned up errors in Makefile for when dkms is NOT installed.

pkoutoupis · Aug 14, 2019 · df31a80 · df31a80
1 parent 246ac4d
commit df31a80
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,13 @@
+*.o
+*.o.*
+*.mod
+*.mod.*
+*.ko
+*.cmd
+*.mk
+*.symvers
+*.order
+src/rapiddisk
+test/rxflush
+test/rxio
+test/rxioctl
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### Release 6.1 ###
+### Release 6.0-1 ###
 
 - kernel: Fix dkms version in module/Makefile.
 - installer: modified dkms installation/removal procedures

diff --git a/module/Makefile b/module/Makefile
@@ -27,7 +27,7 @@ endif
 
 MKDIR := mkdir -pv
 CP := cp -v
-DKMSFILES := $(shell ls *.c) dkms.conf Makefile
+DKMSFILES := rapiddisk.c rapiddisk-cache.c dkms.conf Makefile
 DKMSDEST := /usr/src/rapiddisk-$(VERSION)
 
 obj-m += rapiddisk.o
@@ -52,18 +52,25 @@ clean:
 	rm -rf .tmp_versions .rapiddisk.o.d *.unsigned *.sdtinfo.c .ctf/ .cache.mk
 
 dkms-install:
+ifeq (, $(shell which dkms))
+	$(error "No dkms.")
+else
 ifeq ($(shell dkms status rapiddisk/$(VERSION) -k $(KVER) | grep '$(KVER)' >/dev/null && echo 0 || echo 1 ),0)
 	$(error rapiddisk version $(VERSION) is already installed for kernel $(KVER). Use 'make dkms-uninstall' first.)
 else
 	[ ! -d $(DKMSDEST) ] && $(MKDIR) $(DKMSDEST) || true
 	$(CP) $(DKMSFILES) $(DKMSDEST)
 	dkms install rapiddisk/$(VERSION) -k $(KVER) .
 endif
+endif
 
 dkms-uninstall:
+ifeq (, $(shell which dkms))
+	$(error "No dkms.")
+else
 ifeq ($(shell dkms status rapiddisk/$(VERSION) -k $(KVER) | grep '$(KVER)' >/dev/null && echo 0 || echo 1 ),0)
 	dkms remove rapiddisk/$(VERSION) -k $(KVER)
 else
 	$(error rapiddisk version $(VERSION) is not installed for kernel $(KVER).)
 endif
-
+endif