From 1075d01c075b3dd0dcaeb21d8ba84761f3f27ca8 Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Sat, 29 Oct 2016 11:46:18 -0500
Subject: [PATCH] Removed usr/share/info/dir and cleaned up Makefile

---
 Makefile | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index f0ee57c..a84efa7 100644
--- a/Makefile
+++ b/Makefile
@@ -8,12 +8,12 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-DEPENDS =
+DEPENDS = glibc
 ARCH = x86_64
 URL = https://www.gnu.org/software/make/
 DESC = GNU Make is a tool which controls the generation of executables \
 and other non-source files of a program from the program\'s source files.
-SNAPVER = sr0
+SNAPVER = sr1
 
 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
 TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
@@ -21,10 +21,6 @@ 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 =
-
 include /usr/share/snap/Makefile.snaplinux
 
 $(SRCDIR)/configure: $(ARCHIVE)
@@ -43,8 +39,9 @@ $(SRCDIR)/configure: $(ARCHIVE)
 	@touch $(SRCDIR)/configure
 
 $(SRCDIR)/config.log: $(SRCDIR)/configure
-	@cd $(SRCDIR) && for patch in `find $(PATCHDIR) -name \*.patch`; do \
-		patch --verbose -Np0 -i $$patch; \
+	@cd $(SRCDIR) && \
+	for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \
+		patch --verbose -Np1 -i $$patch; \
 	done
 	@cd $(SRCDIR); \
 	./configure \
@@ -58,8 +55,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure
 		--target=x86_64-snap-linux-gnu
 
 $(SRCDIR)/make: $(SRCDIR)/config.log
-	@cd $(SRCDIR); \
-	$(MAKE)
+	@cd $(SRCDIR) && make
 
 $(ROOT): $(SRCDIR)/make
 	@if [ -d $(ROOT) ]; then \
@@ -68,10 +64,8 @@ $(ROOT): $(SRCDIR)/make
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(SRCDIR); \
-	$(MAKEINST) DESTDIR=$(ROOT)
-
-	@$(SNAPHACKS)
+	@cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \
+	rm -v $(ROOT)/usr/share/info/dir
 
 test: $(ROOT)
 	@cd $(SRCDIR); \