- include disc tree in tarball
- fixed doc/Makefile

[[Imported from SVN: r2919]]