From 9fa7b38ac12adf11e6ed3f05b9d8b99dfa02a5f3 Mon Sep 17 00:00:00 2001
From: Mario Limonciello <mario.limonciello@dell.com>
Date: Thu, 20 Feb 2020 07:57:37 -0600
Subject: [PATCH] Move `fwupdtpmevlog` into `bindir`

---
 contrib/debian/fwupd.install     |  2 +-
 contrib/fwupd.spec.in            |  3 ++-
 plugins/tpm-eventlog/meson.build | 19 ++++++++++++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/contrib/debian/fwupd.install b/contrib/debian/fwupd.install
index a18d18220..1a8dec051 100644
--- a/contrib/debian/fwupd.install
+++ b/contrib/debian/fwupd.install
@@ -2,6 +2,7 @@ usr/bin/dfu-tool
 usr/bin/fwupdmgr
 usr/bin/fwupdagent
 usr/bin/fwupdtool
+usr/bin/fwupdtpmevlog
 etc/*
 usr/share/bash-completion
 usr/share/fwupd/*
@@ -12,7 +13,6 @@ usr/share/locale
 usr/share/metainfo/*
 usr/libexec/fwupd/fwupd
 usr/libexec/fwupd/fwupdoffline
-usr/libexec/fwupd/fwupdtpmevlog
 usr/share/man/man1/*
 lib/systemd/system/*
 lib/systemd/system-preset/*
diff --git a/contrib/fwupd.spec.in b/contrib/fwupd.spec.in
index 3dc6d2191..dda7ab952 100644
--- a/contrib/fwupd.spec.in
+++ b/contrib/fwupd.spec.in
@@ -250,7 +250,7 @@ mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg
 %{_libexecdir}/fwupd/efi/*.efi
 %{_libexecdir}/fwupd/efi/*.efi.signed
 %{_bindir}/fwupdate
-%{_libexecdir}/fwupd/fwupdtpmevlog
+%{_bindir}/fwupdtpmevlog
 %endif
 %{_bindir}/dfu-tool
 %{_bindir}/fwupdmgr
@@ -284,6 +284,7 @@ mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg
 %{_datadir}/man/man1/fwupdagent.1.gz
 %{_datadir}/man/man1/dfu-tool.1.gz
 %{_datadir}/man/man1/fwupdmgr.1.gz
+%{_datadir}/man/man1/fwupdtpmevlog.1.gz
 %if 0%{?have_uefi}
 %{_datadir}/man/man1/fwupdate.1.gz
 %endif
diff --git a/plugins/tpm-eventlog/meson.build b/plugins/tpm-eventlog/meson.build
index b8acf26fa..a0729ed81 100644
--- a/plugins/tpm-eventlog/meson.build
+++ b/plugins/tpm-eventlog/meson.build
@@ -77,9 +77,26 @@ fwupdtpmevlog = executable(
     fwupdplugin,
   ],
   install : true,
-  install_dir : join_paths(libexecdir, 'fwupd')
+  install_dir : bindir
 )
 
+if get_option('man')
+  custom_target('fwupdtpmevlog-man',
+    input : fwupdtpmevlog,
+    output : 'fwupdtpmevlog.1',
+    command : [
+      help2man, '@INPUT@',
+      '--no-info',
+      '--output', '@OUTPUT@',
+      '--name', 'fwupd',
+      '--manual', 'User Commands',
+      '--version-string', fwupd_version,
+    ],
+    install : true,
+    install_dir : join_paths(mandir, 'man1'),
+  )
+endif
+
 run_target('fuzz-tpm-eventlog',
   command: [
     join_paths(meson.source_root(), 'contrib/afl-fuzz.py'),