Modified m4 macro to account for new location.