Start merging of the 1.5 branch into trunk. Start with doc

diff --git a/doc/Doxyfile-html.dox.cmake b/doc/Doxyfile.dox.cmake.in
similarity index 99%
rename from doc/Doxyfile-html.dox.cmake
rename to doc/Doxyfile.dox.cmake.in
index 0c4a4ff5d3a51b11689283c2dc1a4b714eeedf43..1bd970e88af5156836c4055c9749da095487e7ba 100644 (file)
--- a/doc/Doxyfile-html.dox.cmake
+++ b/doc/Doxyfile.dox.cmake.in
@@ -5,10 +5,10 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = OpenJPEG
-PROJECT_NUMBER         =
+PROJECT_NUMBER         = @OPENJPEG_VERSION@
 PROJECT_BRIEF          =
 PROJECT_LOGO           =
-OUTPUT_DIRECTORY       = .
+OUTPUT_DIRECTORY       = @OPENJPEG_BINARY_DIR@/doc
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES