More tweaks that still don't quite build libgroove.
More tweaks that still don't quite build libgroove.

redline6561/salty-runbooks,kingcons/salty-runbooks,redline6561/salty-runbooks,kingcons/salty-runbooks,redline6561/salty-runbooks,kingcons/salty-runbooks