Add exec-prefix to search path.
Merge commit 'aadcfdd998bafefc173b14281f6c855bf101c408'