From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 13 Jan 2021 21:06:31 +0000 (+0000)
Subject: Makefile: Exclude */build/* from rsrcs
X-Git-Tag: otter-0.3.0~30
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=109a0cb4ab0f4b1e7fa8a52898e9389f8b85ff73;p=otter.git

Makefile: Exclude */build/* from rsrcs

When not using nailing-cargo we may run bits of make concurrently with
builds and we don't want to pick up any cargo-downloaded stuff.

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

diff --git a/Makefile b/Makefile
index ee57335b..079a86e1 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ shapelib: templates/shapelib.html stamp/cargo.doc-otter-only
 
 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 \) )
+    find $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