fix make dist
* a few minor fixes so far, not finished yet
more fix to pass make dist
renaming a file
various fixes to pass make dist
more fixes to pass make distcheck
Merge remote-tracking branch 'origin/master' into HEAD