Corrected version and minor Makefile issues

Makefile

@@ -8,26 +8,22 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-DEPENDS = perl,m4
+DEPENDS = dash,perl,m4
 ARCH = x86_64
 URL = https://www.gnu.org/software/autoconf/
+REPO = dev
+BRIEF = Generate configuration scripts
 DESC = Autoconf is an extensible package of M4 macros that produce shell \
 scripts to automatically configure software source code packages.
-SNAPVER = sr0
+SLVER = 2
 
 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/^-//')-$(SLVER)
 
-MAKE = make
+include /usr/share/sl/Makefile.snaplinux
-MAKEINST = make install
-SNAPHACKS = 
-#SNAPHACKS = if [ -f $(ROOT)/usr/share/info/dir ]; then \
-#	rm -v $(ROOT)/usr/share/info/dir; fi
-
-include /usr/share/snap/Makefile.snaplinux
 
 $(SRCDIR): $(ARCHIVE)
 	@if [ '$(TYPE)' == 'application/x-bzip2' ]; then \
@@ -44,8 +40,9 @@ $(SRCDIR): $(ARCHIVE)
 	fi
 
 $(SRCDIR)/config.log: $(SRCDIR)
-	@cd $(SRCDIR) && for patch in `find $(PATCHDIR) -name \*.patch`; do \
+	@cd $(SRCDIR) && \
-		patch --verbose -Np0 -i $$patch; \
+	for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \
+		patch --verbose -Np1 -i $$patch; \
 	done
 	@cd $(SRCDIR); \
 	./configure \
@@ -54,21 +51,18 @@ $(SRCDIR)/config.log: $(SRCDIR)
 		--host=x86_64-snap-linux-gnu \
 		--target=x86_64-snap-linux-gnu
 
-$(SRCDIR)/attr: $(SRCDIR)/config.log
+$(SRCDIR)/bin/autoconf: $(SRCDIR)/config.log
 	@cd $(SRCDIR); \
 	$(MAKE)
 
-$(ROOT): $(SRCDIR)/attr
+$(ROOT): $(SRCDIR)/bin/autoconf
 	@if [ -d $(ROOT) ]; then \
 		touch $(ROOT); \
 	else \
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(SRCDIR); \
+	@cd $(SRCDIR) && make install DESTDIR=$(ROOT)
-	$(MAKEINST) DESTDIR=$(ROOT)
-
-	@$(SNAPHACKS)
 
 test: $(ROOT)
 	@cd $(SRCDIR); \
@@ -76,7 +70,7 @@ test: $(ROOT)
 
 clean:
 	@rm -rvf $(ROOT) \
-		$(SNAPINFO) \
+		$(SLINFO) \
 		$(MANIFEST) \
 		$(FILES) \
 		$(SRCDIR)