Merge pull request #2064 from rubenk/fix-make-distcheck