...confusion galore, but hopefully brings us one step closer towards a working
instdir for Mac OS X.

Change-Id: Icb37a4adb1f91c9e81aaf11036c9d3e548c5ba76