summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJonathan Perkin <jonathan.perkin@oracle.com>2010-12-17 23:08:43 +0000
committerJonathan Perkin <jonathan.perkin@oracle.com>2010-12-17 23:08:43 +0000
commit30cfda089fdbeb2915c35e0609984189a9855b73 (patch)
tree36ae6bd4871f972411c3f1c11d347b0c6bdafe9a /include
parentb1b89865c6ee1ccf919642aa4ea275f68866dae9 (diff)
downloadmariadb-git-30cfda089fdbeb2915c35e0609984189a9855b73.tar.gz
bug#51925: 5.5 installed header file layout is incorrect
The 'mysql' include sub-directory was copied directly into include/ rather than retaining its own directory. Fix this, and update mysql_config which needs additional logic to detect the correct prefix for includes.
Diffstat (limited to 'include')
-rw-r--r--include/CMakeLists.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 5334fc0f5ae..e89929d159d 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -59,6 +59,4 @@ SET(HEADERS
)
INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h" )
-
-
+INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h")