Mercurial > mxe-octave
changeset 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 |
| files | Makefile.in |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Tue Nov 21 22:24:47 2017 -0500 +++ b/Makefile.in Wed Nov 22 08:16:51 2017 -0500 @@ -209,7 +209,7 @@ ## The --compression option for wget is new in 1.19.2 and now without ## using --compression=none, wget seems to uncompress .gz archives ## automatically?!? -WGET_COMP := $(shell wget --compression=none --help >/dev/null && echo x--compression=none | $(SED) 's/x//') +WGET_COMP := $(shell wget --compression=none --help >/dev/null 2>&1 && echo x--compression=none | $(SED) 's/x//') WGET := wget $(WGET_COMP) --no-check-certificate \ --user-agent=$(shell wget --version | \ $(SED) -n 's,GNU \(Wget\) \([0-9.]*\).*,\1/\2,p')