Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 20042)
+++ CMakeLists.txt	(working copy)
@@ -247,15 +247,7 @@
 IF(WIN32 OR OS2)
 	SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
 ELSE (WIN32 OR OS2)
-	IF(TAG_VERSION OR BUILD_OSX_BUNDLE)
-		SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
-	ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
-		IF(NOT WANT_VERSIONING)
-			SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
-		ELSE(NOT WANT_VERSIONING)
-			SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
-		ENDIF(NOT WANT_VERSIONING)
-	ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
+	SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${GENTOOVERSION}/")
 ENDIF (WIN32 OR OS2)
 IF(NOT IS_ABSOLUTE ${DOCDIR})
 	ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")