CVS commit: pkgsrc/mk

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Apr 30 23:52:31 UTC 2020

Modified Files:
        pkgsrc/mk: subst.mk

Log Message:
Simplify


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/mk/subst.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/subst.mk
diff -u pkgsrc/mk/subst.mk:1.88 pkgsrc/mk/subst.mk:1.89
--- pkgsrc/mk/subst.mk:1.88     Thu Apr 30 23:51:45 2020
+++ pkgsrc/mk/subst.mk  Thu Apr 30 23:52:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: subst.mk,v 1.88 2020/04/30 23:51:45 joerg Exp $
+# $NetBSD: subst.mk,v 1.89 2020/04/30 23:52:30 joerg Exp $
 #
 # The subst framework replaces text in one or more files in the WRKSRC
 # directory. Packages can define several ``classes'' of replacements.
@@ -201,7 +201,7 @@ ${_SUBST_COOKIE.${class}}:
                        ${CMP} -s "$$tmpfile" "$$file" && {             \
                                ${AWK} -f ${PKGSRCDIR}/mk/scripts/subst-identity.awk -- ${SUBST_SED.${class}} \
                                && found=$(LC_ALL=C ${SED} -n ${SUBST_SED.${class}:C,^['"]?s.*,&p,} "$$file") \
-                               && [ "x$$found" != "x" ] && {           \
+                               && [ -n "$$found" ] && {                \
                                        changed=yes;                    \
                                        continue;                       \
                                };                                      \