diff options
| author | jlam <jlam@pkgsrc.org> | 2017-05-31 22:56:22 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2017-05-31 22:56:22 +0000 |
| commit | 698dd4ee4628a92e103b7bf87681dd74d4f6f114 (patch) | |
| tree | 6cc1e10df35d1ef16449ee6f08970ed42d00715b /mk/check | |
| parent | 1736ec7d3842096a90ccd4b495c54b6112ca2a2f (diff) | |
| download | pkgsrc-698dd4ee4628a92e103b7bf87681dd74d4f6f114.tar.gz | |
Check that some variables have the correct number of words.
Assert MAKE_DIRS_PERMS and OWN_DIRS_PERMS have the right number of
words before using a multivariable .for loop over those variables.
This prevents errors in parsing the makefiles.
Diffstat (limited to 'mk/check')
| -rw-r--r-- | mk/check/check-files.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mk/check/check-files.mk b/mk/check/check-files.mk index 6471cd8f2b7..6653a50a5d9 100644 --- a/mk/check/check-files.mk +++ b/mk/check/check-files.mk @@ -1,4 +1,4 @@ -# $NetBSD: check-files.mk,v 1.32 2017/04/01 20:55:39 rillig Exp $ +# $NetBSD: check-files.mk,v 1.33 2017/05/31 22:56:22 jlam Exp $ # # This file checks that the list of installed files matches the PLIST. # For that purpose it records the file list of LOCALBASE before and @@ -78,8 +78,12 @@ CHECK_FILES_SKIP+= ${VARBASE}/.* .for d in ${MAKE_DIRS} ${OWN_DIRS} CHECK_FILES_SKIP+= ${d:C/^([^\/])/${PREFIX}\/\1/}.* .endfor -.for d o g m in ${MAKE_DIRS_PERMS} ${OWN_DIRS_PERMS} +.for _var_ in MAKE_DIRS_PERMS OWN_DIRS_PERMS +. if empty(${_var_}) || empty(${_var_}:C/.*/4/:M*:S/4 4 4 4//gW) +. for d o g m in ${${_var_}} CHECK_FILES_SKIP+= ${d:C/^([^\/])/${PREFIX}\/\1/}.* +. endfor +. endif .endfor # Mutable X11 font database files |