| 1 |
grknight 14/05/04 19:37:13 |
| 2 |
|
| 3 |
Added: cmake-doc-path.patch |
| 4 |
Log: |
| 5 |
Version bump to 5.2.6. |
| 6 |
Fixes bugs #380141, #442322, #462432, #474088 |
| 7 |
|
| 8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-db/myodbc/files/cmake-doc-path.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/files/cmake-doc-path.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/files/cmake-doc-path.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: cmake-doc-path.patch |
| 17 |
=================================================================== |
| 18 |
=== modified file 'CMakeLists.txt' |
| 19 |
--- CMakeLists.txt 2013-03-09 09:51:06 +0000 |
| 20 |
+++ CMakeLists.txt 2013-03-09 11:05:27 +0000 |
| 21 |
@@ -33,6 +33,12 @@ |
| 22 |
SET(CONNECTOR_MAJOR "5") |
| 23 |
SET(CONNECTOR_MINOR "2") |
| 24 |
|
| 25 |
+IF(WITH_DOCUMENTATION_INSTALL_PATH) |
| 26 |
+ set(DOCUMENTATION_INSTALL_PATH ${WITH_DOCUMENTATION_INSTALL_PATH}) |
| 27 |
+ELSE(WITH_DOCUMENTATION_INSTALL_PATH) |
| 28 |
+ set(DOCUMENTATION_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/doc/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR}) |
| 29 |
+ENDIF(WITH_DOCUMENTATION_INSTALL_PATH) |
| 30 |
+ |
| 31 |
IF(CONNECTOR_MINOR LESS 10) |
| 32 |
SET(CONNECTOR_MINOR_PADDED "0${CONNECTOR_MINOR}") |
| 33 |
ELSE(CONNECTOR_MINOR LESS 10) |
| 34 |
@@ -329,19 +335,17 @@ |
| 35 |
|
| 36 |
ELSE(WIN32) |
| 37 |
|
| 38 |
- INSTALL(FILES ChangeLog DESTINATION .) |
| 39 |
- INSTALL(FILES README DESTINATION .) |
| 40 |
- INSTALL(FILES README.debug DESTINATION .) |
| 41 |
- INSTALL(FILES INSTALL DESTINATION .) |
| 42 |
+ INSTALL(FILES ChangeLog DESTINATION ${DOCUMENTATION_INSTALL_PATH}) |
| 43 |
+ INSTALL(FILES README DESTINATION ${DOCUMENTATION_INSTALL_PATH}) |
| 44 |
+ INSTALL(FILES README.debug DESTINATION ${DOCUMENTATION_INSTALL_PATH}) |
| 45 |
+ INSTALL(FILES INSTALL DESTINATION ${DOCUMENTATION_INSTALL_PATH}) |
| 46 |
IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING") |
| 47 |
- INSTALL(FILES COPYING DESTINATION .) |
| 48 |
ELSE() |
| 49 |
- INSTALL(FILES LICENSE.mysql DESTINATION .) |
| 50 |
ENDIF() |
| 51 |
|
| 52 |
ENDIF(WIN32) |
| 53 |
|
| 54 |
-INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .) |
| 55 |
+INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ${DOCUMENTATION_INSTALL_PATH}) |
| 56 |
|
| 57 |
INCLUDE(CPack) |
Archives