From c63331a303a15aeb1c38b0bab546ff47a41b8335 Mon Sep 17 00:00:00 2001
From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Mon, 13 Feb 2012 09:27:50 +0000
Subject: [PATCH] Start merging of the 1.5 branch into trunk. Start with doc

---
 doc/{Doxyfile-html.dox.cmake => Doxyfile.dox.cmake.in} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename doc/{Doxyfile-html.dox.cmake => Doxyfile.dox.cmake.in} (99%)

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 0c4a4ff5..1bd970e8 100644
--- 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