main/curl
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Updated Makefile to touch configure so that it can properly depend on ARCHIVE

Browse Source
This commit is contained in:
Jay Larson
2017-05-29 14:56:01 -05:00
parent a8ad9d1ed8
commit 3dfb037f37
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -15,7 +15,7 @@ export URL = http://curl.haxx.se/
BRIEF = Tool which transfers data from or to a server BRIEF = Tool which transfers data from or to a server
DESC = curl is a command line tool and library for transferring data \ DESC = curl is a command line tool and library for transferring data \
with URL syntax with URL syntax
SNAPVER = 2 SNAPVER = 3
ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -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') TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
@@ -31,7 +31,7 @@ DEVROOT := $(DEV)/ROOT
include /usr/share/snap/Makefile.snaplinux include /usr/share/snap/Makefile.snaplinux
$(SRCDIR)/configure: $(SRCDIR)/configure: $(ARCHIVE)
@if [ '$(TYPE)' == 'application/x-bzip2' ]; then \ @if [ '$(TYPE)' == 'application/x-bzip2' ]; then \
tar -jxf $(ARCHIVE); \ tar -jxf $(ARCHIVE); \
elif [ '$(TYPE)' == 'application/x-gzip' ]; then \ elif [ '$(TYPE)' == 'application/x-gzip' ]; then \
@@ -44,6 +44,7 @@ $(SRCDIR)/configure:
echo 'Unable to determine archive type'; \ echo 'Unable to determine archive type'; \
exit 1; \ exit 1; \
fi fi
@touch $(SRCDIR)/configure
$(SRCDIR)/config.log: $(SRCDIR)/configure $(SRCDIR)/config.log: $(SRCDIR)/configure
@cd $(SRCDIR) && \ @cd $(SRCDIR) && \