Corrected version and minor Makefile issues

This commit is contained in:
2020-08-21 09:00:31 -05:00
parent a7a55dcce0
commit f83e085d3b

View File

@@ -15,13 +15,13 @@ REPO = dev
BRIEF = Generate configuration scripts BRIEF = Generate configuration scripts
DESC = Autoconf is an extensible package of M4 macros that produce shell \ DESC = Autoconf is an extensible package of M4 macros that produce shell \
scripts to automatically configure software source code packages. 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) ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//') SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//')
PATCHDIR := $(PWD)/SRC/patches 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 include /usr/share/sl/Makefile.snaplinux
@@ -51,11 +51,11 @@ $(SRCDIR)/config.log: $(SRCDIR)
--host=x86_64-snap-linux-gnu \ --host=x86_64-snap-linux-gnu \
--target=x86_64-snap-linux-gnu --target=x86_64-snap-linux-gnu
$(SRCDIR)/attr: $(SRCDIR)/config.log $(SRCDIR)/bin/autoconf: $(SRCDIR)/config.log
@cd $(SRCDIR); \ @cd $(SRCDIR); \
$(MAKE) $(MAKE)
$(ROOT): $(SRCDIR)/attr $(ROOT): $(SRCDIR)/bin/autoconf
@if [ -d $(ROOT) ]; then \ @if [ -d $(ROOT) ]; then \
touch $(ROOT); \ touch $(ROOT); \
else \ else \