Changes to support architecture specific installation directories.

This references #57.