Make destdir easier to override
Bugfix, and make more real-world proof