This patch is a mess. I started reorganising, splitting in two parts (
which seemed to make sense as we install twice - install in two
different directories for each compile options ), but then stopped and
left this as unfinished.