Fixes to r399104. Don't use hard coded /usr/local in patch files, and
replace the correct variables.

Pointy hat to: flo