From 77bd4a1d9336f360b30e722b9e2d3c562e223d00 Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Mon, 20 Mar 2017 11:15:19 -0500
Subject: [PATCH] The following changes were made to Makefile:

  * Added BRIEF
  * Moved to new version scheme
  * Moved make and make install out of variables
---
 Makefile | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index f7d6cb5..3fed758 100644
--- a/Makefile
+++ b/Makefile
@@ -11,19 +11,16 @@
 DEPENDS =
 ARCH = x86_64
 URL = http://kbd-project.org/
+BRIEF = Console utilities
 DESC = This package contains tools for managing Linux console (Linux console, \
 virtual terminals, keyboard, etc.)
-SNAPVER = sr0
+SNAPVER = 1
 
 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
 TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
 SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//')
 PATCHDIR := $(PWD)/SRC/patches
-VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER)
-
-MAKE = make
-MAKEINST = make install
-SNAPHACKS =
+VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')-$(SNAPVER)
 
 include /usr/share/snap/Makefile.snaplinux
 
@@ -55,8 +52,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure
 		--target=x86_64-snap-linux-gnu
 
 $(SRCDIR)/src/setkeycodes: $(SRCDIR)/config.log
-	@cd $(SRCDIR); \
-	$(MAKE)
+	@cd $(SRCDIR) && make
 
 $(ROOT): $(SRCDIR)/src/setkeycodes
 	@if [ -d $(ROOT) ]; then \
@@ -65,10 +61,7 @@ $(ROOT): $(SRCDIR)/src/setkeycodes
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(SRCDIR); \
-	$(MAKEINST) DESTDIR=$(ROOT)
-
-	@$(SNAPHACKS)
+	@cd $(SRCDIR) && make install DESTDIR=$(ROOT)
 
 test: $(ROOT)
 	@cd $(SRCDIR); \