From f83e085d3b6b35cef5523b71310169a621c48e0f Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Fri, 21 Aug 2020 09:00:31 -0500 Subject: [PATCH] Corrected version and minor Makefile issues --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c7afeac..aa680ff 100644 --- a/Makefile +++ b/Makefile @@ -15,13 +15,13 @@ 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. -SLVER = 1 +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/^-//')$(SLVER) +VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')-$(SLVER) include /usr/share/sl/Makefile.snaplinux @@ -51,11 +51,11 @@ $(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 \