Patrick Georgi submitted this change.

View Change

Approvals: build bot (Jenkins): Verified David Hendricks: Looks good to me, approved Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved
Install the man file when using meson as a buildsystem

This fixes a regression with the Fedora package.

Change-Id: I881bd5002a842072ce9dadea033c51a2668f9e7c
Signed-off-by: Richard Hughes <richard@hughsie.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/38939
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M flashrom.8.tmpl
M meson.build
2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/flashrom.8.tmpl b/flashrom.8.tmpl
index fde98c0..db50d59 100644
--- a/flashrom.8.tmpl
+++ b/flashrom.8.tmpl
@@ -40,7 +40,7 @@
. \}
. \}
..
-.TH FLASHROM 8 "" ""
+.TH FLASHROM 8 "@MAN_DATE@" "@VERSION@" "@MAN_DATE@"
.SH NAME
flashrom \- detect, read, write, verify and erase flash chips
.SH SYNOPSIS
diff --git a/meson.build b/meson.build
index 3d395e8..5374e87 100644
--- a/meson.build
+++ b/meson.build
@@ -321,6 +321,7 @@
prefix = get_option('prefix')
sbindir = join_paths(prefix, get_option('sbindir'))
libdir = join_paths(prefix, get_option('libdir'))
+mandir = join_paths(prefix, get_option('mandir'))

install_headers([
'libflashrom.h',
@@ -394,6 +395,16 @@
description : 'library to interact with flashrom',
)

+conf.set('VERSION', version)
+conf.set('MAN_DATE', run_command('util/getrevision.sh', '--date', 'flashrom.8.tmpl').stdout().strip())
+configure_file(
+ input : 'flashrom.8.tmpl',
+ output : 'flashrom.8',
+ configuration : conf,
+ install: true,
+ install_dir: join_paths(mandir, 'man8'),
+)
+
flashrom_dep = declare_dependency(
link_with : flashrom,
include_directories : include_directories('.'),

To view, visit change 38939. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I881bd5002a842072ce9dadea033c51a2668f9e7c
Gerrit-Change-Number: 38939
Gerrit-PatchSet: 5
Gerrit-Owner: Richard Hughes <richard@hughsie.com>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: David Hendricks <david.hendricks@gmail.com>
Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com>
Gerrit-Reviewer: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-Reviewer: Richard Hughes <richard@hughsie.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Gerrit-MessageType: merged