Mercurial > mxe-octave
comparison Makefile.in @ 4542:4bb667a87c7d
merge stdout and stderr when testing for wget --compression option
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 22 Nov 2017 08:16:51 -0500 |
parents | 23a905c6f5d3 |
children | 7d1e45c2f175 |
comparison
equal
deleted
inserted
replaced
4541:23a905c6f5d3 | 4542:4bb667a87c7d |
---|---|
207 SED := $(shell gsed --help >/dev/null 2>&1 && echo g)sed | 207 SED := $(shell gsed --help >/dev/null 2>&1 && echo g)sed |
208 SORT := $(shell gsort --help >/dev/null 2>&1 && echo g)sort | 208 SORT := $(shell gsort --help >/dev/null 2>&1 && echo g)sort |
209 ## The --compression option for wget is new in 1.19.2 and now without | 209 ## The --compression option for wget is new in 1.19.2 and now without |
210 ## using --compression=none, wget seems to uncompress .gz archives | 210 ## using --compression=none, wget seems to uncompress .gz archives |
211 ## automatically?!? | 211 ## automatically?!? |
212 WGET_COMP := $(shell wget --compression=none --help >/dev/null && echo x--compression=none | $(SED) 's/x//') | 212 WGET_COMP := $(shell wget --compression=none --help >/dev/null 2>&1 && echo x--compression=none | $(SED) 's/x//') |
213 WGET := wget $(WGET_COMP) --no-check-certificate \ | 213 WGET := wget $(WGET_COMP) --no-check-certificate \ |
214 --user-agent=$(shell wget --version | \ | 214 --user-agent=$(shell wget --version | \ |
215 $(SED) -n 's,GNU \(Wget\) \([0-9.]*\).*,\1/\2,p') | 215 $(SED) -n 's,GNU \(Wget\) \([0-9.]*\).*,\1/\2,p') |
216 # The MSYS GNU tar does not support long uid/gid, leading to unpacking | 216 # The MSYS GNU tar does not support long uid/gid, leading to unpacking |
217 # errors for some archives. Bsdtar does not have that limitation, so | 217 # errors for some archives. Bsdtar does not have that limitation, so |