diff --git a/Makefile b/Makefile index e67d77e..e158ecf 100644 --- a/Makefile +++ b/Makefile @@ -8,12 +8,12 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -DEPENDS = +DEPENDS = glibc,gmp ARCH = x86_64 URL = http://www.mpfr.org/ DESC = The MPFR library is a C library for multiple-precision floating-point \ computations with correct rounding. -SNAPVER = sr0 +SNAPVER = sr1 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') @@ -21,10 +21,6 @@ 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 && make html -MAKEINST = make install DESTDIR=$(ROOT) && make install-html DESTDIR=$(ROOT) -SNAPHACKS = - include /usr/share/snap/Makefile.snaplinux $(SRCDIR)/configure: $(ARCHIVE) @@ -43,8 +39,9 @@ $(SRCDIR)/configure: $(ARCHIVE) @touch $(SRCDIR)/configure $(SRCDIR)/config.log: $(SRCDIR)/configure - @cd $(SRCDIR) && for patch in `find $(PATCHDIR) -name \*.patch`; do \ - patch --verbose -Np1 -i $$patch; \ + @cd $(SRCDIR) && \ + for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \ + patch --verbose -Np0 -i $$patch; \ done @cd $(SRCDIR); \ ./configure \ @@ -56,8 +53,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure --target=x86_64-snap-linux-gnu $(SRCDIR)/src/grandom.o: $(SRCDIR)/config.log - @cd $(SRCDIR); \ - $(MAKE) + @cd $(SRCDIR) && make && make html $(ROOT): $(SRCDIR)/src/grandom.o @if [ -d $(ROOT) ]; then \ @@ -66,14 +62,12 @@ $(ROOT): $(SRCDIR)/src/grandom.o mkdir -v $(ROOT); \ fi - @cd $(SRCDIR); \ - $(MAKEINST) - - @$(SNAPHACKS) + @cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \ + make install-html DESTDIR=$(ROOT) && \ + rm -v $(ROOT)/usr/share/info/dir test: $(ROOT) - @cd $(SRCDIR); \ - make check + @cd $(SRCDIR) && make check clean: @rm -rvf $(ROOT) \