diff --git a/Makefile b/Makefile index 631925b..5c43298 100644 --- a/Makefile +++ b/Makefile @@ -11,21 +11,19 @@ DEPENDS = autoconf ARCH = x86_64 URL = https://www.gnu.org/software/automake/ +REPO = dev +BRIEF = Generate Makefile.in for configure from Makefile.am DESC = Automake is a tool for automatically generating Makefile.in files \ compliant with the GNU Coding Standards. -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 = - -include /usr/share/snap/Makefile.snaplinux +include /usr/share/sl/Makefile.snaplinux $(SRCDIR): $(ARCHIVE) @if [ '$(TYPE)' == 'application/x-bzip2' ]; then \ @@ -42,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 \ @@ -53,8 +52,7 @@ $(SRCDIR)/config.log: $(SRCDIR) --target=x86_64-snap-linux-gnu $(SRCDIR)/t/ax/test-defs.sh: $(SRCDIR)/config.log - @cd $(SRCDIR); \ - $(MAKE) + @cd $(SRCDIR) && make $(ROOT): $(SRCDIR)/t/ax/test-defs.sh @if [ -d $(ROOT) ]; then \ @@ -63,10 +61,7 @@ $(ROOT): $(SRCDIR)/t/ax/test-defs.sh mkdir -v $(ROOT); \ fi - @cd $(SRCDIR); \ - $(MAKEINST) DESTDIR=$(ROOT) - - @$(SNAPHACKS) + @cd $(SRCDIR) && make install DESTDIR=$(ROOT) test: $(ROOT) @cd $(SRCDIR); \ @@ -74,7 +69,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