heimdal: Fix variable declaration.
mercurial: Prepare to move system to real /usr
docbook*: Prepare to move system to real /usr