Eli Zaretskii <eliz@gnu.org> writes:

> Can we please have a patch to install, which incorporates all the
> discussions we had here?

Sorry for the delay.

Here is the patch: