[Plplot-cvs] SF.net SVN: plplot:[12284] trunk/doc

[<ai...@us...>]

Revision: 12284
          http://plplot.svn.sourceforge.net/plplot/?rev=12284&view=rev
Author:   airwin
Date:     2013-01-08 05:26:34 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
Insert \$ENV{DESTDIR} appropriately (with the "$" escaped because you
want the environment variable DESTDIR to be read at install time
rather than cmake time) for all install(CODE ... signatures usage.

This change should let "make DESTDIR=<whatever> install" work
correctly at install time whenever the doxygen documentation and the
docbook documentation are being installed.

Only the doxygen install change has been tested, but the
corresponding change to the docbook install should also work
since the same CMake rules should apply.

Modified Paths:
--------------
    trunk/doc/CMakeLists.txt
    trunk/doc/docbook/src/CMakeLists.txt

Modified: trunk/doc/CMakeLists.txt
===================================================================
--- trunk/doc/CMakeLists.txt	2012-12-23 20:09:07 UTC (rev 12283)
+++ trunk/doc/CMakeLists.txt	2013-01-08 05:26:34 UTC (rev 12284)
@@ -114,7 +114,10 @@
     add_dependencies(build_doxygen plplot_octave)
   endif(ENABLE_octave)
 
-  install(CODE "message(STATUS \"Installing: ${DOC_DIR}/doxygen tree\")\nexecute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/doxygen ${DOC_DIR}/doxygen)")
+  install(CODE "
+message(STATUS \"Installing: \$ENV{DESTDIR}${DOC_DIR}/doxygen tree\")
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/doxygen \$ENV{DESTDIR}${DOC_DIR}/doxygen)
+")
   if(DEFINED WWW_USER AND DEFINED WWW_HOST AND DEFINED WWW_DIR)
     add_custom_target(
       www-install-doxygen

Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt	2012-12-23 20:09:07 UTC (rev 12283)
+++ trunk/doc/docbook/src/CMakeLists.txt	2013-01-08 05:26:34 UTC (rev 12284)
@@ -492,7 +492,7 @@
 # command. This makes for slightly ugly looking code. 
 
 if(BUILD_HTML OR PREBUILT_DOC)
-  install(CODE "file(GLOB HTML_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.${HTML_EXT})\n foreach(file \${HTML_FILES}) \n file(INSTALL DESTINATION ${DOC_DIR}/html TYPE FILE FILES \"\${file}\") \n endforeach (file \"\${HTML_FILES}\")")
+  install(CODE "file(GLOB HTML_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.${HTML_EXT})\n foreach(file \${HTML_FILES}) \n file(INSTALL DESTINATION \$ENV{DESTDIR}${DOC_DIR}/html TYPE FILE FILES \"\${file}\") \n endforeach (file \"\${HTML_FILES}\")")
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST} stylesheet.css DESTINATION ${DOC_DIR}/html )
 endif(BUILD_HTML OR PREBUILT_DOC)
 
@@ -501,12 +501,12 @@
 endif(BUILD_PRINT OR PREBUILT_DOC)
 
 if(BUILD_MAN OR PREBUILT_DOC)
-  install(CODE "file(GLOB MAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.${MANVOL})\n foreach(file \${MAN_FILES}) \n file(INSTALL DESTINATION ${MAN_DIR}/man3 TYPE FILE FILES \"\${file}\") \n endforeach (file \"\${MAN_FILES}\")")
+  install(CODE "file(GLOB MAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.${MANVOL})\n foreach(file \${MAN_FILES}) \n file(INSTALL DESTINATION \$ENV{DESTDIR}${MAN_DIR}/man3 TYPE FILE FILES \"\${file}\") \n endforeach (file \"\${MAN_FILES}\")")
 #  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST} DESTINATION ${MAN_DIR}/man3 )
 endif(BUILD_MAN OR PREBUILT_DOC)
 
 if(BUILD_INFO OR PREBUILT_DOC)
-  install(CODE "file(GLOB INFO_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.info*)\n foreach(file \${INFO_FILES}) \n file(INSTALL DESTINATION ${INFO_DIR} TYPE FILE FILES \"\${file}\") \n endforeach (file \"\${INFO_FILES}\")")
+  install(CODE "file(GLOB INFO_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.info*)\n foreach(file \${INFO_FILES}) \n file(INSTALL DESTINATION \$ENV{DESTDIR}${INFO_DIR} TYPE FILE FILES \"\${file}\") \n endforeach (file \"\${INFO_FILES}\")")
 #  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST} DESTINATION ${INFO_DIR} )
 endif(BUILD_INFO OR PREBUILT_DOC)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.