diff --git a/Makefile b/Makefile index 8bebc6b..7920ad4 100644 --- a/Makefile +++ b/Makefile @@ -8,22 +8,21 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -DEPENDS = ARCH = x86_64 +DEPENDS = dash,glibc +BUILDDEPS = URL = https://www.gnu.org/software/libtool/ +REPO = dev +BRIEF = Generic library support script DESC = GNU libtool is a generic library support script. Libtool hides the \ complexity of using shared libraries behind a consistent, portable interface. -SNAPVER = sr0 +SNAPVER = 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) - -MAKE = make -MAKEINST = make install -SNAPHACKS = +VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')-$(SNAPVER) include /usr/share/snap/Makefile.snaplinux @@ -43,7 +42,8 @@ $(SRCDIR)/configure: $(ARCHIVE) @touch $(SRCDIR)/configure $(SRCDIR)/config.log: $(SRCDIR)/configure - @cd $(SRCDIR) && for patch in `find $(PATCHDIR) -name \*.patch`; do \ + @cd $(SRCDIR) && \ + for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \ patch --verbose -Np1 -i $$patch; \ done @cd $(SRCDIR); \ @@ -54,8 +54,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure --target=x86_64-snap-linux-gnu $(SRCDIR)/libltdl/.libs/libltdl.so.$(VERSION): $(SRCDIR)/config.log - @cd $(SRCDIR); \ - $(MAKE) + @cd $(SRCDIR) && make $(ROOT): $(SRCDIR)/libltdl/.libs/libltdl.so.$(VERSION) @if [ -d $(ROOT) ]; then \ @@ -64,14 +63,11 @@ $(ROOT): $(SRCDIR)/libltdl/.libs/libltdl.so.$(VERSION) mkdir -v $(ROOT); \ fi - @cd $(SRCDIR); \ - $(MAKEINST) DESTDIR=$(ROOT) - - @$(SNAPHACKS) + @cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \ + rm -v $(ROOT)/usr/share/info/dir test: $(ROOT) - @cd $(SRCDIR); \ - make check + @cd $(SRCDIR) && make check clean: @rm -rvf $(ROOT) \