mk/pkgtasks: Rename some make(1) variables to be more descriptive.

This commit is contained in:
jlam 2017-08-10 05:25:10 +00:00
parent d5e3dfb5b3
commit dedd4c0b82
2 changed files with 10 additions and 10 deletions

BIN
mk/pkgtasks/.files.mk.swp Normal file

Binary file not shown.

View file

@ -1,4 +1,4 @@
# $NetBSD: files.mk,v 1.3 2017/06/02 16:12:25 jlam Exp $
# $NetBSD: files.mk,v 1.4 2017/08/10 05:25:10 jlam Exp $
#
# Copyright (c) 2017 The NetBSD Foundation, Inc.
# All rights reserved.
@ -110,13 +110,13 @@ __INIT_SCRIPTS_PERMS= ${_INIT_SCRIPTS_PERMS:S|^${PREFIX}/||g}
# Assert that the variables have the right number of words and
# that no target file is listed in more than one variable.
#
_ALL_FILES.files= # empty
_ALL_TARGET_FILES.files= # empty
.for _var_ in CONF_FILES REQD_FILES _INIT_SCRIPTS
. if empty(${_var_}) || empty(${_var_}:C/.*/2/:M*:S/2 2//gW)
# ${_var_} has a multiple of 2 words.
. for s t in ${${_var_}}
_FILES.${t}+= ${_var_}
_ALL_FILES.files+= ${t}
_FILE_VARLIST.${t}+= ${_var_}
_ALL_TARGET_FILES.files+= ${t}
. endfor
. else
PKG_FAIL_REASON+= ${_var_:Q}" must have a multiple of 2 words."
@ -126,16 +126,16 @@ PKG_FAIL_REASON+= ${_var_:Q}" must have a multiple of 2 words."
. if empty(${_var_}) || empty(${_var_}:C/.*/5/:M*:S/5 5 5 5 5//gW)
# ${_var_} has a multiple of 5 words.
. for s t o g m in ${${_var_}}
_FILES.${t}+= ${_var_}
_ALL_FILES.files+= ${t}
_FILE_VARLIST.${t}+= ${_var_}
_ALL_TARGET_FILES.files+= ${t}
. endfor
. else
PKG_FAIL_REASON+= ${_var_:Q}" must have a multiple of 5 words."
. endif
.endfor
.for t in ${_ALL_FILES.files:O:u}
. if ${_FILES.${t}:[#]} != 1
PKG_FAIL_REASON+= ${t:Q}" is listed more than once: "${_FILES.${t}:Q}
.for t in ${_ALL_TARGET_FILES.files:O:u}
. if ${_FILE_VARLIST.${t}:[#]} != 1
PKG_FAIL_REASON+= ${t:Q}" is listed more than once: "${_FILE_VARLIST.${t}:Q}
. endif
.endfor
@ -151,7 +151,7 @@ PKG_FAIL_REASON+= ${t:Q}" is listed more than once: "${_FILES.${t}:Q}
.if defined(PKG_SYSCONFSUBDIR) && !empty(PKG_SYSCONFSUBDIR)
# Always create ${PKG_SYSCONFDIR} if ${PKG_SYSCONFSUBDIR} is non-empty.
MAKE_DIRS_PERMS+= ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR_PERMS}
.elif !empty(_ALL_FILES.files:M${PKG_SYSCONFDIR}/*)
.elif !empty(_ALL_TARGET_FILES.files:M${PKG_SYSCONFDIR}/*)
# Create ${PKG_SYSCONFDIR} if any target files are in that directory.
MAKE_DIRS+= ${PKG_SYSCONFDIR}
.endif