From 05d1c5660ebdc01b3d9281de54e4458c993dbdbd Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Thu, 16 Feb 2017 10:33:33 -0600
Subject: [PATCH] The following changes were made to Makefile:

  * Changed to new snap version format
  * set LEXLIB='' during make to prevent binaries from requiring libfl

Also removed unneeded empty file from patch directory
---
 Makefile               | 15 +++++++++------
 SRC/patches/asdf.patch |  0
 2 files changed, 9 insertions(+), 6 deletions(-)
 delete mode 100644 SRC/patches/asdf.patch

diff --git a/Makefile b/Makefile
index af60ccc..0611aac 100644
--- a/Makefile
+++ b/Makefile
@@ -8,18 +8,19 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-DEPENDS = flex,glibc,zlib
+DEPENDS = glibc,zlib
 ARCH = x86_64
 URL = http://www.gnu.org/software/binutils/
+BRIEF = Binary tools
 DESC = The GNU Binutils are a collection of binary tools.
-SNAPVER = sr3
+SNAPVER = 4
 
 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
 BUILDDIR := $(PWD)/BUILD
-VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER)
+VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')-$(SNAPVER)
 
 include /usr/share/snap/Makefile.snaplinux
 
@@ -46,7 +47,7 @@ $(BUILDDIR)/config.log: $(SRCDIR)/configure
 	@if [ ! -d $(BUILDDIR) ]; then \
 		mkdir -v $(BUILDDIR); \
 	fi
-	@cd $(BUILDDIR); \
+	@cd $(BUILDDIR) && \
 	../$(SRCDIR)/configure \
 		--prefix=/usr \
 		--enable-shared \
@@ -56,7 +57,8 @@ $(BUILDDIR)/config.log: $(SRCDIR)/configure
 		--target=x86_64-snap-linux-gnu
 
 $(BUILDDIR)/binutils/ar: $(BUILDDIR)/config.log
-	@cd $(BUILDDIR) && make tooldir=/usr
+	@cd $(BUILDDIR) && \
+	LEXLIB='' make tooldir=/usr
 
 $(ROOT): $(BUILDDIR)/binutils/ar
 	@if [ -d $(ROOT) ]; then \
@@ -65,7 +67,8 @@ $(ROOT): $(BUILDDIR)/binutils/ar
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(BUILDDIR) && make tooldir=/usr install DESTDIR=$(ROOT) && \
+	@cd $(BUILDDIR) && \
+	make tooldir=/usr install DESTDIR=$(ROOT) && \
 	rm -v $(ROOT)/usr/share/info/dir
 
 test: $(ROOT)
diff --git a/SRC/patches/asdf.patch b/SRC/patches/asdf.patch
deleted file mode 100644
index e69de29..0000000