* commit 'f4ca970d':
  configure: Add docdir configuration option

Conflicts:
	configure
	doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>