From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Wed, 30 Jan 2013 00:17:26 +0000 (+0100)
Subject: Merge branch 'v3_9_x'
X-Git-Tag: v3_9_90~598
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c9a7c0824a9cee4a6a22a4b90ffe382926dea4a4?hp=af98b4ecc7b8ab3dc60fabbcc883868c8a805818

Merge branch 'v3_9_x'
---

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index 426ef524fa..74b4736f63 100644
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -5,7 +5,7 @@
 # doc
 file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/html/)
 install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/html/"
-  DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/html/)
+  DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/html/)
 
 #### Generate the manpages
 if(NOT WIN32)
diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index 861388fdaf..465a8e5ca1 100644
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -74,7 +74,11 @@ endif()
 message("\nConfiguration of package `simgrid':")
 message("        BUILDNAME ...........: ${BUILDNAME}")
 message("        SITE ................: ${SITE}")
-message("        Release .............: simgrid-${release_version}")
+if(release)
+  message("        Release .............: simgrid-${release_version} (stable)")
+else()
+  message("        Release .............: simgrid-${release_version} (beta version)")
+endif()
 message("")
 message("        Compiler: C .........: ${CMAKE_C_COMPILER} (${CMAKE_C_COMPILER_ID})")
 message("                version .....: ${COMPILER_C_VERSION}")