[certi-cvs] certi/doc doc_install.in DoxyTools.cmake

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      08/10/14 21:09:07

Modified files:
        doc            : doc_install.in DoxyTools.cmake 

Log message:
        Handle DESTDIR properly.
        This is needed for building RPM and DEB packages

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/doc/doc_install.in?cvsroot=certi&r1=3.2&r2=3.3
http://cvs.savannah.gnu.org/viewcvs/certi/doc/DoxyTools.cmake?cvsroot=certi&r1=3.4&r2=3.5

Patches:
Index: doc_install.in
===================================================================
RCS file: /sources/certi/certi/doc/doc_install.in,v
retrieving revision 3.2
retrieving revision 3.3
diff -u -b -r3.2 -r3.3
--- doc_install.in      13 Oct 2008 14:32:35 -0000      3.2
+++ doc_install.in      14 Oct 2008 21:09:06 -0000      3.3
@@ -2,12 +2,12 @@
 SET(HTMLGEN @genhtml@)
 IF (HTMLGEN)
    MESSAGE(STATUS "Installing HTML output for Doc set <@DOCSET@>...")
-   EXECUTE_PROCESS(COMMAND @CMAKE_COMMAND@ -E copy_directory 
@DoxyTools_OUTPUT_DIR@/html 
@CMAKE_INSTALL_PREFIX@/share/doc/certi/@DOCSET@/html)
+   EXECUTE_PROCESS(COMMAND @CMAKE_COMMAND@ -E copy_directory 
@DoxyTools_OUTPUT_DIR@/html 
$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/doc/certi/@DOCSET@/html)
 ENDIF (HTMLGEN)
 
 SET(PDFGEN @genpdf@)
 IF (PDFGEN)
        MESSAGE(STATUS "Installing PDF output for Doc set <@DOCSET@>...")
-       EXECUTE_PROCESS(COMMAND @CMAKE_COMMAND@ -E copy 
@DoxyTools_OUTPUT_DIR@/latex/refman.pdf 
@CMAKE_INSTALL_PREFIX@/share/doc/certi/@DOCSET@/address@hidden@.pdf)
+       EXECUTE_PROCESS(COMMAND @CMAKE_COMMAND@ -E copy 
@DoxyTools_OUTPUT_DIR@/latex/refman.pdf 
$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/doc/certi/@DOCSET@/address@hidden@.pdf)
 ENDIF (PDFGEN)
 MESSAGE(STATUS "Doc set <@DOCSET@> installed.")
\ No newline at end of file

Index: DoxyTools.cmake
===================================================================
RCS file: /sources/certi/certi/doc/DoxyTools.cmake,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -b -r3.4 -r3.5
--- DoxyTools.cmake     13 Oct 2008 14:32:35 -0000      3.4
+++ DoxyTools.cmake     14 Oct 2008 21:09:07 -0000      3.5
@@ -116,8 +116,8 @@
     ENDIF(genpdf AND PDFLATEX_COMPILER)
     
     IF (genhtml)
-       MESSAGE(STATUS "Will install ${DoxyTools_OUTPUT_DIR}")
-       CONFIGURE_FILE(doc_install.in ${DOCSET}_doc_install.cmake)
+       MESSAGE(STATUS "Will build DOC Set <${DOCSET}> in 
<${DoxyTools_OUTPUT_DIR}>")
+       CONFIGURE_FILE(doc_install.in ${DOCSET}_doc_install.cmake @ONLY)
        INSTALL(SCRIPT ${CMAKE_BINARY_DIR}/${DOCSET}_doc_install.cmake 
COMPONENT DOC)            
     ENDIF (genhtml)