Remove some duplicated code for handling Mac modules.  No functional change (intended).  Also stoped setting srcdir twice.