Fixed intltool in-source build support.

Merge upstream  code. Fixes in-source build and uses proper quoting.