Mercurial > hg > batmud > maputils
changeset 2367:89c2a0358300
Make it configurable in config.mak whether to use wget or curl.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Fri, 01 Oct 2021 09:34:02 +0300 |
| parents | c77498fb9ccb |
| children | ba0ff73a1013 |
| files | README config.mak world/Makefile |
| diffstat | 3 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/README Fri Oct 01 08:39:48 2021 +0300 +++ b/README Fri Oct 01 09:34:02 2021 +0300 @@ -34,7 +34,7 @@ software packages or functional equivalents installed: - GCC 4.6 or later (or Clang or possibly other C99 compatible compiler) - - GNU Wget + - GNU Wget or curl - Perl 5.10 or later - ImageMagick (GraphicsMagick might not work) - GNU diff, patch, make and sed
--- a/config.mak Fri Oct 01 08:39:48 2021 +0300 +++ b/config.mak Fri Oct 01 09:34:02 2021 +0300 @@ -16,11 +16,15 @@ COLORMAP_HTML=-f html5 +HTTPGET = wget -O +#HTTPGET = curl -o + + ### ### Misc stuff ### RSCP = rsync -vptogz -e ssh -UPLOAD_URL=ccr@tnsp.org:/var/www/tnsp.org/maps/ +UPLOAD_URL = ccr@tnsp.org:/var/www/tnsp.org/maps/ CFLAGS += -DTH_PROG_AUTHOR="\"Written by Matti 'ccr' Hamalainen (C) Copyright 2006-2021 TNSP\"" CFLAGS += -DTH_PROG_LICENSE="\"This software is licensed under GNU General Public License version 2\""
--- a/world/Makefile Fri Oct 01 08:39:48 2021 +0300 +++ b/world/Makefile Fri Oct 01 09:34:02 2021 +0300 @@ -86,7 +86,7 @@ # Fetch raw ASCII maps from bat.org to *.new fetch: - for i in $(CONT_MAPS); do wget -O "$$i.new" "$(BATMAPURL)$$i.txt"; done + for i in $(CONT_MAPS); do $(HTTPGET) "$$i.new" "$(BATMAPURL)$$i.txt"; done # Remove all temporary .diff files