Merge pull request #63 from adrianbroher/gnuinstalldir