[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=f784857

The following commit has been merged in the master branch:
commit f78485770cf8d00b69a5e12322e067fddd0f8b03
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Jan 16 03:35:02 2013 +0000

    Forum #1364.  Better CMake support for doing 'make doc'
---
 CMakeLists.txt | 11 ++++++-----
 cmake_doc.sh   | 24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45d0506..e0bf1ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,13 +191,14 @@ ADD_CUSTOM_TARGET(testv COMMAND make testv "EXIV2_BINDIR=${CMAKE_BINARY_DIR}/bin
 
 ##
 # http://dev.exiv2.org/boards/3/topics/1364
-# copy the taglist to be used to make docs
+# effectively does an make doc on the root directory
+# has to run make config and ./configure 
+# and copy the taglist to be used to make docs
 IF( MINGW OR UNIX OR APPLE)
   ADD_CUSTOM_TARGET(doc 
-    COMMAND mkdir -p  "${CMAKE_SOURCE_DIR}/src/bin"
-    COMMAND cp -f     "${CMAKE_BINARY_DIR}/bin/taglist" "${CMAKE_SOURCE_DIR}/src/bin"
-    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/doc/"
-    COMMAND make doc 
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+    COMMAND chmod +x ./cmake_doc.sh
+    COMMAND ./cmake_doc.sh "${CMAKE_BINARY_DIR}"
   )
 ENDIF()
 
diff --git a/cmake_doc.sh b/cmake_doc.sh
new file mode 100755
index 0000000..f6abab4
--- /dev/null
+++ b/cmake_doc.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+##
+# this is called by the CMake build to build the docs
+##
+if [ $# == 1 ]; then
+    CMAKE_BINARY_DIR="$1"
+    echo hello world
+
+    if [ -e src/exv_conf.h ]; then
+        mv src/exv_conf.h src/exv_conf.h.keep
+    fi
+    make config
+    ./configure
+    if [ -e src/exv_conf.h.keep ]; then
+        mv src/exv_conf.h.keep src/exv_conf.h
+    fi
+    mkdir -p  src/bin/
+    cp    -f  "${CMAKE_BINARY_DIR}/bin/taglist" src/bin/
+    make doc
+fi
+
+# That's all Folks
+##

-- 
exiv2 packaging