summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2020-03-22 13:19:50 +0000
committerrillig <rillig@pkgsrc.org>2020-03-22 13:19:50 +0000
commit7b942317abd96ae312693cdae9826fd1d570c65b (patch)
tree02b38f1e034eff9412fbe344b9dc4709967a88e7 /mk
parentae18df10a8b2a68a45667d826b30e21d33128ed2 (diff)
downloadpkgsrc-7b942317abd96ae312693cdae9826fd1d570c65b.tar.gz
mk/subst.mk: ignore directories in SUBST_FILES
Seen in multimedia/libmp4v2, where a pattern also matches the CVS directory from the distfiles.
Diffstat (limited to 'mk')
-rw-r--r--mk/subst.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/subst.mk b/mk/subst.mk
index 1314859f355..e9136770e2e 100644
--- a/mk/subst.mk
+++ b/mk/subst.mk
@@ -1,4 +1,4 @@
-# $NetBSD: subst.mk,v 1.69 2020/03/22 12:15:59 rillig Exp $
+# $NetBSD: subst.mk,v 1.70 2020/03/22 13:19:50 rillig Exp $
#
# The subst framework replaces text in one or more files in the WRKSRC
# directory. Packages can define several ``classes'' of replacements.
@@ -159,7 +159,7 @@ ${_SUBST_COOKIE.${_class_}}:
case $$file in /*) ;; *) file="./$$file";; esac; \
tmpfile="$$file.subst.sav"; \
if [ ! -f "$$file" ]; then \
- ${_SUBST_WARN.${_class_}} "Ignoring non-existent file \"$$file\"."; \
+ [ -d "$$file" ] || ${_SUBST_WARN.${_class_}} "Ignoring non-existent file \"$$file\"."; \
elif ${_SUBST_IS_TEXT_FILE_CMD.${_class_}}; then \
${SUBST_FILTER_CMD.${_class_}} \
< "$$file" \