Move fwupdtool and fwupdagent into bindir

These are intended to be executed by users (albeit for debugging and
advanced users) and shouldn't be left as an internal implementation
per FHS 3.0.

contrib/ci/build_windows.sh

@@ -52,9 +52,6 @@ makensis -NOCD $build/contrib/setup-win32.nsi
 #so that it's actually executable
 cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/*.dll .
 
-#move these so they work
-mv fwupd/*.exe .
-
 #remove static archives
 find -type f -name "*.dll.a" | xargs rm -f
 

contrib/debian/fwupd.install

@@ -1,5 +1,7 @@
 usr/bin/dfu-tool
 usr/bin/fwupdmgr
+usr/bin/fwupdagent
+usr/bin/fwupdtool
 etc/*
 usr/share/bash-completion
 usr/share/fwupd/*
@@ -9,9 +11,7 @@ usr/share/polkit-1/*
 usr/share/locale
 usr/share/metainfo/*
 usr/libexec/fwupd/fwupd
-usr/libexec/fwupd/fwupdagent
 usr/libexec/fwupd/fwupdoffline
-usr/libexec/fwupd/fwupdtool
 usr/libexec/fwupd/fwupdtpmevlog
 usr/share/man/man1/*
 lib/systemd/system/*

contrib/fwupd.spec.in

@@ -248,8 +248,6 @@ mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg
 %config(noreplace)%{_sysconfdir}/fwupd/thunderbolt.conf
 %dir %{_libexecdir}/fwupd
 %{_libexecdir}/fwupd/fwupd
-%{_libexecdir}/fwupd/fwupdtool
-%{_libexecdir}/fwupd/fwupdagent
 %{_libexecdir}/fwupd/fwupdoffline
 %if 0%{?have_uefi}
 %{_libexecdir}/fwupd/efi/*.efi
@@ -262,6 +260,8 @@ mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg
 %endif
 %{_bindir}/dfu-tool
 %{_bindir}/fwupdmgr
+%{_bindir}/fwupdtool
+%{_bindir}/fwupdagent
 %dir %{_sysconfdir}/fwupd
 %dir %{_sysconfdir}/fwupd/remotes.d
 %if 0%{?have_dell}
@@ -286,6 +286,8 @@ mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg
 %{_datadir}/polkit-1/actions/org.freedesktop.fwupd.policy
 %{_datadir}/polkit-1/rules.d/org.freedesktop.fwupd.rules
 %{_datadir}/dbus-1/system-services/org.freedesktop.fwupd.service
+%{_datadir}/man/man1/fwupdtool.1.gz
+%{_datadir}/man/man1/fwupdagent.1.gz
 %{_datadir}/man/man1/dfu-tool.1.gz
 %{_datadir}/man/man1/fwupdmgr.1.gz
 %{_datadir}/metainfo/org.freedesktop.fwupd.metainfo.xml

contrib/setup-win32.nsi

@@ -60,7 +60,7 @@ Section "fwupd"
 
   # fwupd
   File "dfu-tool.exe"
-  File "fwupd/fwupdtool.exe"
+  File "fwupdtool.exe"
   File "libfwupd-2.dll"
   File "libfwupdplugin-1.dll"
   File "libgcab-1.0-0.dll"

contrib/snap/fwupdtool.wrapper

@@ -1,2 +1,2 @@
 #!/bin/sh
-exec "$SNAP/fwupd-command" $SNAP/libexec/fwupd/fwupdtool $@
+exec "$SNAP/fwupd-command" $SNAP/bin/fwupdtool $@

src/meson.build

@@ -83,7 +83,7 @@ fwupdagent = executable(
     fwupdplugin,
   ],
   install : true,
-  install_dir : join_paths(libexecdir, 'fwupd')
+  install_dir : bindir
 )
 endif
 
@@ -174,7 +174,7 @@ fwupdtool = executable(
     fwupdplugin
   ],
   install : true,
-  install_dir : join_paths(libexecdir, 'fwupd')
+  install_dir : bindir
 )
 
 if build_daemon and get_option('man')
@@ -193,6 +193,36 @@ if build_daemon and get_option('man')
     install : true,
     install_dir : join_paths(mandir, 'man1'),
   )
+  custom_target('fwupdagent-man',
+    input : fwupdagent,
+    output : 'fwupdagent.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
+if get_option('man')
+  custom_target('fwupdtool-man',
+    input : fwupdtool,
+    output : 'fwupdtool.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
 
 if build_daemon