[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=c58081c

The following commit has been merged in the master branch:
commit c58081c01729563101fb82f6f358512611220e40
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Jan 15 07:26:23 2013 +0000

    doc: updated as reported in http://dev.exiv2.org/boards/3/topics/1364 Thanks to Benjamin for bringing this to our attention.
---
 CMakeLists.txt | 12 ++++++++++++
 doc/Makefile   | 11 +++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 259f4b3..45d0506 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,6 +190,18 @@ ADD_CUSTOM_TARGET(teste COMMAND make teste "EXIV2_BINDIR=${CMAKE_BINARY_DIR}/bin
 ADD_CUSTOM_TARGET(testv COMMAND make testv "EXIV2_BINDIR=${CMAKE_BINARY_DIR}/bin"  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test/" )
 
 ##
+# http://dev.exiv2.org/boards/3/topics/1364
+# 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 
+  )
+ENDIF()
+
+##
 # support for test suite TODO: fixup for MSVC and think a bit more before deploying this
 # ENABLE_TESTING()
 # INCLUDE(Dart)
diff --git a/doc/Makefile b/doc/Makefile
index 9269b35..00bb9c7 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -68,8 +68,15 @@ doxygen:
 	doxygen $(top_srcdir)/config/Doxyfile
 
 tags:
-	cd $(top_srcdir)/doc/templates && $(MAKE) all
-	cp -f $(top_srcdir)/doc/templates/*.html $(top_srcdir)/doc/html/
+	cp -f    $(top_srcdir)/src/bin/taglist $(top_srcdir)/src
+	mkdir -p $(top_srcdir)/doc/html
+	rm   -rf $(top_srcdir)/doc/html
+	mkdir -p $(top_srcdir)/doc/html
+	cd       $(top_srcdir)/doc/templates && $(MAKE) all
+	cp -f    $(top_srcdir)/doc/templates/*.html $(top_srcdir)/doc/html/
+	@echo    "*****************************"
+	@echo    "*** if you got lots of errors, try modifying" $(realpath $(top_srcdir)/config/Doxyfile) "***"
+	@echo    "*****************************"
 
 mostlyclean clean:
 	$(RM) *~ *.bak *#

-- 
exiv2 packaging