Mercurial > hg > batmud > maputils
changeset 2524:73f3062d717c
Rename two Makefile variables.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 14 Aug 2023 12:53:56 +0300 |
| parents | 8b6a32b66e0f |
| children | 562c0d7b25fb |
| files | Makefile.common config.mak world/Makefile |
| diffstat | 3 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.common Mon Aug 14 12:53:35 2023 +0300 +++ b/Makefile.common Mon Aug 14 12:53:56 2023 +0300 @@ -83,5 +83,5 @@ $(addprefix $(MISC_MAPS_PATH),$(addsuffix .html,$(MISC_MAPS))) \ $(addprefix $(MISC_MAPS_PATH),$(addsuffix .map,$(MISC_MAPS))) \ $(addprefix $(MISC_MAPS_PATH),$(addsuffix .loc,$(MISC_MAPS))) - $(RSCP) $? $(UPLOAD_URL) + $(RSCP_COMMAND) $? $(RSCP_UPLOAD_URL) @touch $@
--- a/config.mak Mon Aug 14 12:53:35 2023 +0300 +++ b/config.mak Mon Aug 14 12:53:56 2023 +0300 @@ -44,10 +44,9 @@ ### Misc stuff ### # rsync command for uploading files +RSCP_COMMAND = rsync -vptogzL -e ssh +RSCP_UPLOAD_URL = ccr@tnsp.org:/var/www/tnsp.org/maps/ -RSCP = rsync -vptogzL -e ssh - -UPLOAD_URL = ccr@tnsp.org:/var/www/tnsp.org/maps/ # Download URL for raw ASCII world maps BATMAP_URL = https://www.bat.org/maps/raw/
--- a/world/Makefile Mon Aug 14 12:53:35 2023 +0300 +++ b/world/Makefile Mon Aug 14 12:53:56 2023 +0300 @@ -156,12 +156,12 @@ # Upload changed files to site upload: $(TARGETS) $(LOCFILES) $(EXTRA_UPLOAD) - $(RSCP) $? $(UPLOAD_URL) + $(RSCP_COMMAND) $? $(RSCP_UPLOAD_URL) @touch $@ # Upload only *.loc files uploc: $(LOCFILES) $(EXTRA_UPLOAD) - $(RSCP) $+ $(UPLOAD_URL) + $(RSCP_COMMAND) $+ $(RSCP_UPLOAD_URL) # Clean temporary and generated targets clean: