Update some Holmakefiles following commit 6e6ca26.