From 39b48c45f4f6c0f45c990aaee6768f3ef24bd9ef Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Sun, 30 Oct 2016 16:56:11 -0500
Subject: [PATCH] Fixed path problem with /sbin

---
 Makefile | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index a9b8025..ef8206b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,11 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-DEPENDS =
+DEPENDS = glibc,ncurses,readline
 ARCH = x86_64
 URL = https://www.gnu.org/software/inetutils/
 DESC = Inetutils is a collection of common network programs.
-SNAPVER = sr0
+SNAPVER = sr2
 
 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
 TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
@@ -20,12 +20,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 = install -d -m 755 $(ROOT)/bin && \
-	mv -v $(ROOT)/usr/bin/{hostname,ping{,6},traceroute} $(ROOT)/bin && \
-	mv -v $(ROOT)/usr/bin/ifconfig /sbin
-
 include /usr/share/snap/Makefile.snaplinux
 
 $(SRCDIR)/configure: $(ARCHIVE)
@@ -44,9 +38,10 @@ $(SRCDIR)/configure: $(ARCHIVE)
 	@touch $(SRCDIR)/configure
 
 $(SRCDIR)/config.log: $(SRCDIR)/configure
-	@if [ -f $(PATCHDIR)/*.patch ]; then \
-		cd $(SRCDIR) && cat $(PATCHDIR)/*.patch|patch --verbose -Np1; \
-	fi
+	@cd $(SRCDIR) && \
+	for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \
+		patch --verbose -Np0 -i $$patch; \
+	done
 	@cd $(SRCDIR); \
 	./configure \
 		--prefix=/usr \
@@ -63,8 +58,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure
 		--target=x86_64-snap-linux-gnu
 
 $(SRCDIR)/ifconfig/ifconfig: $(SRCDIR)/config.log
-	@cd $(SRCDIR); \
-	$(MAKE)
+	@cd $(SRCDIR) && make
 
 $(ROOT): $(SRCDIR)/ifconfig/ifconfig
 	@if [ -d $(ROOT) ]; then \
@@ -73,10 +67,12 @@ $(ROOT): $(SRCDIR)/ifconfig/ifconfig
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(SRCDIR); \
-	$(MAKEINST) DESTDIR=$(ROOT)
-
-	@$(SNAPHACKS)
+	@cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \
+	install -d -m 755 $(ROOT)/bin && \
+	install -d -m 755 $(ROOT)/sbin && \
+	mv -v $(ROOT)/usr/bin/{hostname,ping{,6},traceroute} $(ROOT)/bin && \
+	mv -v $(ROOT)/usr/bin/ifconfig $(ROOT)/sbin && \
+	rm -v $(ROOT)/usr/share/info/dir
 
 test: $(ROOT)
 	@cd $(SRCDIR); \