I'm not 100% certain I've done this bit right. Can anyone confirm this is ok? I'm assuming that prefix used to be there as a hack to get around the target-dir stuff.