 @@ -1,14 +1,14 @@
-# $NetBSD: subst.mk,v 1.77 2020/04/18 12:21:10 rillig Exp $
+# $NetBSD: subst.mk,v 1.78 2020/04/18 12:59:43 rillig Exp $
+#
 # The subst framework replaces text in one or more files in the WRKSRC
 # directory. Packages can define several ``classes'' of replacements.
 # Each such class defines:
+#
 #	- in which stage of the build process the replacement happens
 #	- which files are affected by the replacement
 #	- which text or pattern is replaced by which replacement text
+#
 # A typical example is:
+#
 #	SUBST_CLASSES+=		prefix
 #	SUBST_STAGE.prefix=	pre-configure
 @@ -183,19 +183,19 @@ ${_SUBST_COOKIE.${class}}:
 				${RM} -f "$$tmpfile";			\
 			else						\
 				changed=yes;				\
 				${_SUBST_KEEP.${class}};		\
 				${MV} -f "$$tmpfile" "$$file"; 		\
 				${ECHO} "$$file" >> ${.TARGET}.tmp;	\
 			fi;						\
 		else							\
 			${_SUBST_WARN.${class}} "Ignoring non-text file \"$$file\"."; \
 		fi;							\
 	done;								\
+	\
 	if ${TEST} "$$changed,${SUBST_NOOP_OK.${class}:tl}" = no,no; then \
-		${FAIL_MSG} "[subst.mk:${class}] The pattern $$pattern has no effect."; \
+		${FAIL_MSG} "[subst.mk:${class}] The filename pattern \"$$pattern\" has no effect."; \
 	fi; \
 	done; \
 	cd ${WRKDIR}; ${RMDIR} "$$emptydir"
 	${RUN} ${TOUCH} ${TOUCH_FLAGS} ${.TARGET}.tmp && ${MV} ${.TARGET}.tmp ${.TARGET}
 .endfor

 @@ -213,27 +213,27 @@ SUBST_NOOP_OK.class=	no
 .include "prepare-subst.mk"
 .include "mk/subst.mk"
 all: subst-class
 EOF
 	create_file_lines "single"	"already an example"
 	run_bmake "testcase.mk" > "$tmpdir/actual-output" && exitcode=0 || exitcode=$?
 	create_file_lines "expected-output" \
 		'=> Substituting "class" in single' \
 		'warning: [subst.mk:class] Nothing changed in ./single.' \
-		'fail: [subst.mk:class] The pattern single has no effect.' \
+		'fail: [subst.mk:class] The filename pattern "single" has no effect.' \
 		'*** Error code 1' \
 		'' \
 		'Stop.' \
 		"$make: stopped in $PWD"
 	assert_that "actual-output" --file-equals "expected-output"
 	assert_that "single" --file-contains-exactly "already an example"
 	assert_that "$exitcode" --equals "1"
 	test_case_end
 fi
 if test_case_begin "single file nonexistent"; then
 @@ -246,27 +246,27 @@ SUBST_SED.class=	-e 's,file,example,'
 SUBST_NOOP_OK.class=	no
 .include "prepare-subst.mk"
 .include "mk/subst.mk"
 all: subst-class
 EOF
 	run_bmake "testcase.mk" > "$tmpdir/actual-output" && exitcode=0 || exitcode=$?
 	create_file_lines "expected-output" \
 		'=> Substituting "class" in nonexistent' \
 		'warning: [subst.mk:class] Ignoring non-existent file "./nonexistent".' \
-		'fail: [subst.mk:class] The pattern nonexistent has no effect.' \
+		'fail: [subst.mk:class] The filename pattern "nonexistent" has no effect.' \
 		'*** Error code 1' \
 		'' \
 		'Stop.' \
 		"$make: stopped in $PWD"
 	assert_that "actual-output" --file-equals "expected-output"
 	assert_that "$exitcode" --equals "1"
 	test_case_end
 fi
 if test_case_begin "single file nonexistent ok"; then
 @@ -874,55 +874,51 @@ if test_case_begin "pattern matches dire
 	assert_that "stdout" --file-is-lines \
 		"=> Substituting \"dir\" in sub*"
 	assert_that "stderr" --file-is-empty
 	assert_that "$exitcode" --equals 0
 	test_case_end
 fi
 if test_case_begin "pattern matches only directory"; then
 	# When a pattern matches a directory, that directory is silently
 	# skipped.
 	# In this test case, the pattern also matches a regular file that
 	# is actually modified. Therefore the pattern has an effect, and
 	# there is no error message.
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	dir' \
 		'SUBST_STAGE.dir=	pre-configure' \
 		'SUBST_FILES.dir=	sub*' \
 		'SUBST_VARS.dir=	VAR' \
 		'SUBST_NOOP_OK.dir=	no' \
 		'' \
 		'VAR=			value' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	mkdir "$tmpdir/subdir"
 	create_file_lines "subdir/subfile" \
 		"@VAR@"
 	run_bmake "testcase.mk" "pre-configure" \
 > "$tmpdir/stdout" \
 > "$tmpdir/stderr" \
 	&& exitcode=0 || exitcode=$?
 	assert_that "subdir/subfile" --file-is-lines "@VAR@" # unchanged
 	assert_that "stdout" --file-is-lines \
 		"=> Substituting \"dir\" in sub*" \
-		"fail: [subst.mk:dir] The pattern sub* has no effect." \
+		'fail: [subst.mk:dir] The filename pattern "sub*" has no effect.' \
 		"*** Error code 1" \
 		"" \
 		"Stop." \
 		"$make: stopped in $PWD"
 	assert_that "stderr" --file-is-empty
 	assert_that "$exitcode" --equals 1
 	test_case_end
 fi
 if test_case_begin "first filename pattern has no effect"; then
 @@ -939,21 +935,21 @@ if test_case_begin "first filename patte
 		'B=			b-value' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	create_file_lines "file1"	"nothing to replace"
 	create_file_lines "file2"	"nothing to replace"
 	run_bmake "testcase.mk" "pre-configure" 1> "$tmpdir/out" 2>&1 \
 	&& exitcode=0 || exitcode=$?
 	assert_that "out" --file-is-lines \
 		'=> Substituting "id" in file1 file2' \
 		'warning: [subst.mk:id] Nothing changed in ./file1.' \
-		'fail: [subst.mk:id] The pattern file1 has no effect.' \
+		'fail: [subst.mk:id] The filename pattern "file1" has no effect.' \
 		'*** Error code 1' \
 		'' \
 		'Stop.' \
 		"$make: stopped in $PWD"
 	test_case_end
 fi