From a7a55dcce056690a6f379bead4ce42b2e474dab5 Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Fri, 21 Aug 2020 08:51:38 -0500 Subject: [PATCH] Moved to new slp format --- Makefile | 28 +++++++++++----------------- {SNAP => SL}/README | 0 2 files changed, 11 insertions(+), 17 deletions(-) rename {SNAP => SL}/README (100%) diff --git a/Makefile b/Makefile index abb8f94..c7afeac 100644 --- a/Makefile +++ b/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 = 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') 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 -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 +include /usr/share/sl/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 \ - 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 \ @@ -65,10 +62,7 @@ $(ROOT): $(SRCDIR)/attr mkdir -v $(ROOT); \ fi - @cd $(SRCDIR); \ - $(MAKEINST) DESTDIR=$(ROOT) - - @$(SNAPHACKS) + @cd $(SRCDIR) && make install DESTDIR=$(ROOT) test: $(ROOT) @cd $(SRCDIR); \ @@ -76,7 +70,7 @@ test: $(ROOT) clean: @rm -rvf $(ROOT) \ - $(SNAPINFO) \ + $(SLINFO) \ $(MANIFEST) \ $(FILES) \ $(SRCDIR) diff --git a/SNAP/README b/SL/README similarity index 100% rename from SNAP/README rename to SL/README