From 992ff18c7efacb17408a7e2881e304c600a75503 Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Tue, 21 Feb 2017 18:41:36 -0600
Subject: [PATCH] The following changes were made to Makefile:

  * Added BRIEF
  * Moved to new version scheme
  * Moved make commands to more appropriate location
---
 Makefile | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 21696f0..52bb0a7 100644
--- a/Makefile
+++ b/Makefile
@@ -11,21 +11,18 @@
 DEPENDS =
 ARCH = x86_64
 URL = http://sethwklein.net/iana-etc
+BRIEF = Definitions for services and protocols
 DESC = The iana-etc package installs services(5) and protocols(5) using \
 data from the Internet Assigned Numbers Authority <http://www.iana.org/>
-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)
+VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')-$(SNAPVER)
 
-# 'make get' should download latest, but currently doesn't...
-
-MAKE = make
-MAKEINST = make install
-SNAPHACKS =
+# NOTE: 'make get' should download latest, but currently doesn't...
 
 include /usr/share/snap/Makefile.snaplinux
 
@@ -45,8 +42,7 @@ $(SRCDIR)/Makefile: $(ARCHIVE)
 	@touch $(SRCDIR)/Makefile
 
 $(SRCDIR)/services: $(SRCDIR)/Makefile
-	@cd $(SRCDIR); \
-	$(MAKE)
+	@cd $(SRCDIR) && make
 
 $(ROOT): $(SRCDIR)/services
 	@if [ -d $(ROOT) ]; then \
@@ -55,10 +51,7 @@ $(ROOT): $(SRCDIR)/services
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(SRCDIR); \
-	$(MAKEINST) DESTDIR=$(ROOT)
-
-	@$(SNAPHACKS)
+	@cd $(SRCDIR) && make install DESTDIR=$(ROOT)
 
 test: $(ROOT)
 	@cd $(SRCDIR); \