[Plplot-cvs] SF.net SVN: plplot:[8967] trunk/doc/docbook/src/CMakeLists.txt

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

Revision: 8967
          http://plplot.svn.sourceforge.net/plplot/?rev=8967&view=rev
Author:   airwin
Date:     2008-10-26 01:30:34 +0000 (Sun, 26 Oct 2008)

Log Message:
-----------
Remove all reference to documentation.php since that is configured and
uploaded to the website elsewhere (via commands set up in www/CMakeLists.txt).

Append /htdocs/docbook-manual to all references to ${WWW_DIR}.  This makes
external setting of WWW_DIR consistent with external script use and other
Makefile targets.

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

Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt	2008-10-25 19:28:19 UTC (rev 8966)
+++ trunk/doc/docbook/src/CMakeLists.txt	2008-10-26 01:30:34 UTC (rev 8967)
@@ -511,7 +511,6 @@
     set(HTML_TARBALL ${BASE_HTML}.tar.gz)
     set(INFO_TARBALL ${BASE_INFO}.tar.gz)
     set(MAN_TARBALL ${BASE_MAN}.tar.gz)
-    set(DOCUMENTATION_PHP ${CMAKE_CURRENT_BINARY_DIR}/../../../www/documentation.php)
 
     set(WWW_USERAT ${WWW_USER}@)
     set(RCP_PREFIX ${WWW_USERAT}${WWW_HOST}:)
@@ -558,7 +557,6 @@
     ${BASE}.pdf
     ${BASE}.dvi
     -C ${CMAKE_CURRENT_SOURCE_DIR}/.. COPYING
-    -C ${CMAKE_CURRENT_BINARY_DIR}/../../../www documentation.php
     DEPENDS
     ${CMAKE_CURRENT_BINARY_DIR}/${HTML_TARBALL}
     ${CMAKE_CURRENT_BINARY_DIR}/${INFO_TARBALL}
@@ -567,21 +565,19 @@
     ${BASE}.pdf
     ${BASE}.dvi
     ${CMAKE_CURRENT_SOURCE_DIR}/../COPYING
-    ${DOCUMENTATION_PHP}
     )
 
-    add_custom_target(www-uninstall COMMAND ${RSH_COMMAND} rm -rf ${WWW_DIR})
+    add_custom_target(www-uninstall COMMAND ${RSH_COMMAND} rm -rf ${WWW_DIR}/htdocs/docbook-manual)
 
     add_custom_target(
     www-install
-    COMMAND ${RSH_COMMAND} mkdir -p ${WWW_DIR}
-    COMMAND ${RCP} ${TARBALL} ${RCP_PREFIX}${WWW_DIR}
-    COMMAND ${RSH_COMMAND} tar xfz ${WWW_DIR}/${TARBALL} -C ${WWW_DIR}
-    COMMAND ${RSH_COMMAND} tar xfz ${WWW_DIR}/${HTML_TARBALL} -C ${WWW_DIR}
-    COMMAND ${RSH_COMMAND} mv ${WWW_DIR}/documentation.php ${WWW_DIR}/../documentation.php 
-    COMMAND ${RSH_COMMAND} chgrp -R ${WWW_GROUP} ${WWW_DIR}
-    COMMAND ${RSH_COMMAND} chmod -R g=u ${WWW_DIR}
-    COMMAND ${RSH_COMMAND} rm -f ${WWW_DIR}/${TARBALL}
+    COMMAND ${RSH_COMMAND} mkdir -p ${WWW_DIR}/htdocs/docbook-manual
+    COMMAND ${RCP} ${TARBALL} ${RCP_PREFIX}${WWW_DIR}/htdocs/docbook-manual
+    COMMAND ${RSH_COMMAND} tar xfz ${WWW_DIR}/htdocs/docbook-manual/${TARBALL} -C ${WWW_DIR}/htdocs/docbook-manual
+    COMMAND ${RSH_COMMAND} tar xfz ${WWW_DIR}/htdocs/docbook-manual/${HTML_TARBALL} -C ${WWW_DIR}/htdocs/docbook-manual
+    COMMAND ${RSH_COMMAND} chgrp -R ${WWW_GROUP} ${WWW_DIR}/htdocs/docbook-manual
+    COMMAND ${RSH_COMMAND} chmod -R g=u ${WWW_DIR}/htdocs/docbook-manual
+    COMMAND ${RSH_COMMAND} rm -f ${WWW_DIR}/htdocs/docbook-manual/${TARBALL}
     DEPENDS
     ${CMAKE_CURRENT_BINARY_DIR}/${TARBALL}
     )


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