changeset 2610:70524cd664f5

Add MKLOC_DIFF_OPTS Makefile setting passed to mkloc when generating loc diffs.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 16 Feb 2024 15:12:57 +0200
parents f69cc460d9f1
children 54dec981e678
files world/Makefile
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/world/Makefile	Fri Feb 16 14:48:28 2024 +0200
+++ b/world/Makefile	Fri Feb 16 15:12:57 2024 +0200
@@ -107,12 +107,9 @@
 %.diff: %.map %.new
 	@echo "DIFFING $< ..."
 	@if $(DIFFMAP_BIN) $(DIFFMAP_OPTS) $+ -o $@ -a; then \
-		echo "PATCHING ..."; \
-		$(MAP2PPM_BIN) $@ -o $@.ppm -d; \
 		$(PATCHMAP_BIN) $< $@ -o $<; \
 	fi
-	@echo "UPDATING LOCATIONS ..."
-	@$(MKLOC_BIN) -v -m $(patsubst %.map,%.new,$<) -l $(patsubst %.map,%.loc,$<) -L -g -o $(patsubst %.map,%.nloc,$<)
+	@$(MKLOC_BIN) $(MKLOC_DIFF_OPTS) -v -m $(patsubst %.map,%.new,$<) -l $(patsubst %.map,%.loc,$<) -L -g -o $(patsubst %.map,%.nloc,$<)
 	@diff -ubB $(patsubst %.map,%.loc,$<) $(patsubst %.map,%.nloc,$<) | patch
 
 # Fetch raw ASCII maps from bat.org to *.new