From 6cbec66d26c2ee6bda56c28317fd9c69de9b4f15 Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Wed, 19 Apr 2017 09:12:42 -0500
Subject: [PATCH] The following changes were made to Makefile:

  * added BRIEF
  * moved to new version scheme
  * corrected dependencies (glibc,ncurses)
  * moved make and make install out of variables
---
 Makefile | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index a78ecd7..82a6e04 100644
--- a/Makefile
+++ b/Makefile
@@ -8,22 +8,19 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-DEPENDS =
+DEPENDS = glibc,ncurses
 ARCH = x86_64
 URL = https://www.gnu.org/software/less/
+BRIEF = The less pager
 DESC = GNU less is a program similar to more, but which allows backward \
 movement in the file as well as forward movement.
-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)/less: $(SRCDIR)/config.log
-	@cd $(SRCDIR); \
-	$(MAKE)
+	@cd $(SRCDIR) && make
 
 $(ROOT): $(SRCDIR)/less
 	@if [ -d $(ROOT) ]; then \
@@ -65,10 +61,7 @@ $(ROOT): $(SRCDIR)/less
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(SRCDIR); \
-	$(MAKEINST) DESTDIR=$(ROOT)
-
-	@$(SNAPHACKS)
+	@cd $(SRCDIR) && make install DESTDIR=$(ROOT)
 
 clean:
 	@rm -rvf $(ROOT) \