diff --git a/Makefile b/Makefile index cc140f0..23c225b 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ export URL = http://curl.haxx.se/ BRIEF = Tool which transfers data from or to a server DESC = curl is a command line tool and library for transferring data \ with URL syntax -SNAPVER = 5 +SNAPVER = 6 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') @@ -54,7 +54,6 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure @cd $(SRCDIR); \ ./configure \ --prefix=/usr \ - --disable-static \ --enable-threaded-resolver \ --without-ssl \ --with-gnutls \ @@ -78,13 +77,13 @@ $(ROOT): $(SRCDIR)/src/curl install -v -d $(LIBROOT)/usr/lib && \ install -v -d $(DEV)/SNAP && \ install -v -d $(DEVROOT) && \ - mv -v $(ROOT)/usr/lib/libcurl* $(LIBROOT)/usr/lib && \ for file in `find $(ROOT)|egrep \ 'man3\/|pkgconfig\/|\.a$$|\.h$$|\.m4$$'`; do \ path=`dirname $$file|sed "s[$(ROOT)[$(DEVROOT)["`; \ mkdir -vp -m 0755 $$path; \ mv -v $$file $$path; \ done && \ + mv -v $(ROOT)/usr/lib/libcurl* $(LIBROOT)/usr/lib && \ find $(ROOT) -type d -empty -delete && \ cd $(LIB) && make -f ../Makefile.libcurl && mv *.snap ../ && \ cd $(DEV) && make -f ../Makefile.curl-dev && mv *.snap ../