--- utils/meson.build.orig	2018-07-19 12:25:55.000000000 +1000
+++ utils/meson.build	2020-08-31 21:53:41.045975000 +1000
@@ -14,12 +14,14 @@
   pango_view_deps += libpangoft2_dep
 endif
 
-if xft_dep.found() and build_pangoft2
-  pango_view_sources += [
-    'viewer-pangoxft.c',
-    'viewer-x.c',
-  ]
-  pango_view_deps += [ libpangoft2_dep, libpangoxft_dep, ]
+if get_option('xft')
+  if xft_dep.found() and build_pangoft2
+    pango_view_sources += [
+      'viewer-pangoxft.c',
+      'viewer-x.c',
+    ]
+    pango_view_deps += [ libpangoft2_dep, libpangoxft_dep, ]
+  endif
 endif
 
 if cairo_dep.found()
@@ -42,6 +44,7 @@
 help2man = find_program('help2man', required: false)
 if help2man.found()
   help2man_opts = [
+    '--no-discard-stderr',
     '--no-info',
     '--section=1',
     '--help-option=--help-all',
@@ -54,7 +57,7 @@
                   help2man, help2man_opts, '--output=@OUTPUT@', pango_view
                 ],
                 install: true,
-                install_dir: join_paths(pango_datadir, 'man/man1'))
+                install_dir: join_paths(pango_prefix, 'man/man1'))
 endif
 
 if cairo_dep.found()