diff options
| -rw-r--r-- | comfignat.mk | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/comfignat.mk b/comfignat.mk index 6f2d719..9d6badc 100644 --- a/comfignat.mk +++ b/comfignat.mk @@ -472,11 +472,10 @@ define convey_builder_directory_variable all_directories += '-Dstage_${1}="${stage_${1}}"' usage_directories += ${if ${call usage_relevant,${1}}, \ '-D${1}="${call usage_pathname,${1}}"'} - endef # convey_builder_directory_variable takes the name of a builder-relevant # directory variable and returns Make code that conveys that variable to -# project files. The code snippet ends with a line break. +# project files. # · Append a symbol definition to all_directories to convey the variable to # comfignat.gpr in the right form for inclusion in a program. # · Also convey to comfignat.gpr the corresponding pathname under the @@ -490,11 +489,10 @@ define use_directories_project_variable all_directories += '-D${1}=${directories_project}.${1}' usage_directories += ${if ${call usage_relevant,${1}}, \ '-D${1}=${directories_project}.${1}'} - endef # use_directories_project_variable takes the name of a builder-relevant # directory variable and returns Make code that makes project files get that -# variable from a directories project. The code snippet ends with a line break. +# variable from a directories project. # · Append a symbol definition to all_directories for comfignat.gpr. # · If the variable is also usage-relevant, then append a symbol definition # to usage_directories for usage projects. @@ -537,12 +535,12 @@ all_directories += '-DLockdir="${lockdir}"' # pathnames. # Set the builder-relevant directory variables. -${eval ${foreach var,${builder_directory_variables}, \ - ${if ${or ${findstring command line,${origin ${var}}}, \ - ${filter true,${${var}_is_configured}}, \ - ${filter 0,${words ${dirgpr}}}}, \ - ${call convey_builder_directory_variable,${var}}, \ - ${call use_directories_project_variable,${var}}}}} +${foreach var,${builder_directory_variables}, \ + ${if ${or ${findstring command line,${origin ${var}}}, \ + ${filter true,${${var}_is_configured}}, \ + ${filter 0,${words ${dirgpr}}}}, \ + ${eval ${call convey_builder_directory_variable,${var}}}, \ + ${eval ${call use_directories_project_variable,${var}}}}} # For each builder-relevant directory variable, check whether its value in # project files should be taken from the corresponding Make variable or from a # directories project, and construct symbol definitions accordingly. |