Merge to mysql-next-mr-bugfixing

2487bc32 · Jonathan Perkin · ff68d482 · b0a89a2e · 2487bc32
Commit 2487bc32 authored Feb 23, 2010 by Jonathan Perkin
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

CMakeLists.txt CMakeLists.txt +3 -2

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -268,7 +268,8 @@ ELSE()
  SET(CPACK_GENERATOR "TGZ")
 ENDIF() 
 INCLUDE(CPack)
-INSTALL(FILES COPYING EXCEPTIONS-CLIENT README DESTINATION ${INSTALL_DOCREADMEDIR})
+INSTALL(FILES COPYING EXCEPTIONS-CLIENT LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} OPTIONAL)
+INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR})
 IF(UNIX)
  INSTALL(FILES Docs/INSTALL-BINARY DESTINATION 
  ${INSTALL_DOCREADMEDIR})