From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 13 Jan 2021 21:11:37 +0000 (+0000)
Subject: Makefile: Fix recent changes
X-Git-Tag: otter-0.3.0~29
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=dd1adda3c52ad799838cd38affbec15c569d265f;p=otter.git

Makefile: Fix recent changes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Makefile b/Makefile
index 079a86e1..45b65e79 100644
--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,8 @@ shapelib: templates/shapelib.html stamp/cargo.doc-otter-only
 #---------- funky macros etc. ----------
 
 cr = $(addprefix --,$(filter-out debug,$1))
-rsrcs = $(shell \
-    find $1 \( -name Cargo.toml -o -name Cargo.lock -o -name Cargo.lock.example -o -name \*.rs \) ) \! -path '*/build/*'
+rsrcs = $(shell set -x;\
+    find -H $1 \( -name Cargo.toml -o -name Cargo.lock -o -name Cargo.lock.example -o -name \*.rs \) \! -path '*/build/*' )
 stamp=@mkdir -p stamp; touch $@
 
 BUNDLED_SOURCES_LIT = README.md LICENCE
@@ -282,7 +282,7 @@ $(addprefix templates/,$(TXTFILES)): templates/%: %.txt
 libraries: $(LIBRARY_FILES)
 
 templates/shapelib.html: $(TARGET_DIR)/debug/otterlib $(LIBRARY_FILES)
-	$(NAILING_CARGO_JUST_RUN) --- $(abspath $<) \
+	$(NAILING_CARGO_JUST_RUN) $(abspath $<) \
 	--libs '$(addprefix $(PWD)/, $(addsuffix .toml, $(LIBRARIES)))' \
 		preview >$@.tmp && mv -f $@.tmp $@