generate the manpage at installation, not when the documentation is regenerated....

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index c1d81c1..d12a638 100644 (file)
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -14,6 +14,17 @@ install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/html/"
   PATTERN "*~" EXCLUDE
 )
 
+#### Generate the manpages
+if( NOT MANPAGE_DIR )
+       set( MANPAGE_DIR $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/man/share/man/man1 )
+endif( NOT MANPAGE_DIR)
+
+add_custom_target(TARGET install
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${MANPAGE_DIR}
+       COMMAND pod2man tools/simgrid_update_xml.pl > ${MANPAGE_DIR}/simgrid_update_xml.1
+       COMMENT "Generating manpages"
+)
+
 # binaries
 install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/smpicc
                  ${CMAKE_BINARY_DIR}/bin/smpif2c

diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake
index 90cbac4..e478ee1 100644 (file)
--- a/buildtools/Cmake/GenerateDoc.cmake
+++ b/buildtools/Cmake/GenerateDoc.cmake
@@ -1,17 +1,3 @@
-#### Generate the manpages
-if( NOT MANPAGE_DIRECTORY )
-       set( MANPAGE_DIRECTORY /usr/share/man/man1 )
-endif( NOT MANPAGE_DIRECTORY)
-
-set(MANPAGES doc/simgrid_update_xml.1)
-
-add_custom_command(OUTPUT doc/simgrid_update_xml.1
-       COMMAND pod2man tools/simgrid_update_xml.pl > doc/simgrid_update_xml.1
-       COMMENT "Generating manpage for simgrid_update_xml"
-)
-install(FILES ${MANPAGES} 
-               DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/man/man1/)
-
 #### Generate the html documentation
 
 if(BIBTEX2HTML)
@@ -61,7 +47,7 @@ if(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTOOL_PATH AND BIBTEX2HTML_PATH AND ICONV
        
        ADD_CUSTOM_TARGET(simgrid_documentation
                COMMENT "Generating the SimGrid documentation..."
-               DEPENDS ${DOC_SOURCES} ${DOC_FIGS} ${source_doxygen} ${DOC_bib} ${MANPAGES}
+               DEPENDS ${DOC_SOURCES} ${DOC_FIGS} ${source_doxygen} ${DOC_bib}
                COMMAND ${FIG2DEV_PATH}/fig2dev -Lmap ${CMAKE_HOME_DIRECTORY}/doc/fig/simgrid_modules.fig | perl -pe 's/imagemap/simgrid_modules/g'| perl -pe 's/<IMG/<IMG style=border:0px/g' | ${CMAKE_HOME_DIRECTORY}/tools/doxygen/fig2dev_postprocessor.pl > ${CMAKE_HOME_DIRECTORY}/doc/simgrid_modules.map
                WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc
        )