changeset 1719:3f38040dafce

Fix handling of tooltip.js in uploads.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 12 Oct 2017 13:38:40 +0300
parents 781e487ecd5e
children 1dd41dd74b2f
files Makefile.gen
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.gen	Thu Oct 12 13:13:08 2017 +0300
+++ b/Makefile.gen	Thu Oct 12 13:38:40 2017 +0300
@@ -21,7 +21,7 @@
 MAPSTATS_BIN=$(BINPATH)mapstats$(EXEEXT)
 
 
-MAP_FILES=tooltip.js votk.html votk.map \
+MAP_FILES=votk.html votk.map \
 	faerieforest.html faerieforest.map \
 	lanzia.html lanzia.map \
 	rilynttar.html rilynttar.map \
@@ -66,7 +66,7 @@
 $(MAP_PATH)%.html: $(MAP_PATH)%.map $(MAP_PATH)%.name $(COLORMAP_BIN)
 	$(COLORMAP_BIN) $(COLORMAP_OPTS) `cat $(patsubst %.map,%.opts,$<)` $(COLORMAP_HTML) -t "`cat $(patsubst %.map,%.name,$<)`" -o $@ $<
 
-$(MAP_PATH)%.html: $(MAP_PATH)%.map $(MAP_PATH)%.loc $(MAP_PATH)%.desc $(MKCITYMAP_BIN)
+$(MAP_PATH)%.html: $(MAP_PATH)%.map $(MAP_PATH)%.loc $(MAP_PATH)%.desc $(MKCITYMAP_BIN) tooltip.js
 	$(MKCITYMAP_BIN) $(MKCITYMAP_OPTS) -t "`cat $(patsubst %.map,%.desc,$<)`" $< $(patsubst %.map,%.loc,$<) `cat $(patsubst %.map,%.opts,$<)` -o "$@"
 
 
@@ -77,7 +77,7 @@
 	@hg up
 	@hg2cl
 
-upload: $(addprefix $(MAP_PATH),$(MAP_FILES))
+upload: tooltip.js $(addprefix $(MAP_PATH),$(MAP_FILES))
 	@scp -C $? $(UPLOAD_URL)
 	@touch $@