Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/70209 )
Change subject: meson.build: Rename conf object to config_manfile ......................................................................
meson.build: Rename conf object to config_manfile
The config data in the conf object is specific to the man file. Thus, rename it accordingly and also move the declaration to the place where it is used.
Change-Id: Icf24b9c47d4c7553f1ec045a9dfd3685b1376445 Signed-off-by: Felix Singer felixsinger@posteo.net --- M meson.build 1 file changed, 18 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/09/70209/1
diff --git a/meson.build b/meson.build index 14a84ac..859256f 100644 --- a/meson.build +++ b/meson.build @@ -28,8 +28,6 @@ '-Wno-missing-braces', ]
-conf = configuration_data() - cc = meson.get_compiler('c') add_project_arguments(cc.get_supported_arguments(warning_flags), language : 'c') add_project_arguments('-D_DEFAULT_SOURCE', language : 'c') @@ -591,12 +589,13 @@ description : 'library to interact with flashrom', )
-conf.set('VERSION', version) -conf.set('MAN_DATE', run_command('util/getversion.sh', '--man-date', check : true).stdout().strip()) +config_manfile = configuration_data() +config_manfile.set('VERSION', version) +config_manfile.set('MAN_DATE', run_command('util/getversion.sh', '--man-date', check : true).stdout().strip()) configure_file( input : 'flashrom.8.tmpl', output : 'flashrom.8', - configuration : conf, + configuration : config_manfile, install: true, install_dir: join_paths(get_option('mandir'), 'man8'), )