Build fixes

These changes make it possible to build upstream version 8.0.0 (and also include the new clients subdir in the package).

Perhaps @thk-guest could merge and try again?

Merge request reports

Loading