Line 0
Link Here
|
|
|
1 |
--- cmake/install_layout.cmake.orig 2016-02-01 23:31:58 UTC |
2 |
+++ cmake/install_layout.cmake |
3 |
@@ -32,7 +32,11 @@ |
4 |
# SVR4 |
5 |
# Solaris package layout suitable for pkg* tools, prefix=/opt/mysql/mysql |
6 |
# |
7 |
-# FREEBSD, GLIBC, OSX, TARGZ |
8 |
+# FREEBSD |
9 |
+# Build with prefix=/usr/local, create tarball with install prefix="." |
10 |
+# and relative links. |
11 |
+# |
12 |
+# GLIBC, OSX, TARGZ |
13 |
# Build with prefix=/usr/local/mysql, create tarball with install prefix="." |
14 |
# and relative links. |
15 |
# |
16 |
@@ -94,6 +98,8 @@ IF(UNIX) |
17 |
SET(CPACK_SET_DESTDIR ON) |
18 |
ELSEIF(INSTALL_LAYOUT MATCHES "SVR4") |
19 |
SET(default_prefix "/opt/mysql/mysql") |
20 |
+ ELSEIF(INSTALL_LAYOUT MATCHES "FREEBSD") |
21 |
+ SET(default_prefix "/usr/local") |
22 |
ELSE() |
23 |
SET(default_prefix "/usr/local/mysql") |
24 |
ENDIF() |
25 |
@@ -145,6 +151,9 @@ ELSEIF(INSTALL_LAYOUT MATCHES "RPM" OR |
26 |
INSTALL_LAYOUT MATCHES "DEB") |
27 |
SET(secure_file_priv_path "/var/lib/mysql-files") |
28 |
SET(secure_file_priv_embedded_path "NULL") |
29 |
+ELSEIF(INSTALL_LAYOUT MATCHES "FREEBSD") |
30 |
+ SET(secure_file_priv_path "/var/db/mysql_secure") |
31 |
+ SET(secure_file_priv_embedded_path "NULL") |
32 |
ELSE() |
33 |
SET(secure_file_priv_path "${default_prefix}/mysql-files") |
34 |
SET(secure_file_priv_embedded_path "NULL") |
35 |
@@ -210,26 +219,26 @@ SET(INSTALL_SECURE_FILE_PRIV_EMBEDDEDDIR |
36 |
# FREEBSD layout |
37 |
# |
38 |
SET(INSTALL_BINDIR_FREEBSD "bin") |
39 |
-SET(INSTALL_SBINDIR_FREEBSD "bin") |
40 |
-SET(INSTALL_SCRIPTDIR_FREEBSD "scripts") |
41 |
+SET(INSTALL_SBINDIR_FREEBSD "libexec") |
42 |
+SET(INSTALL_SCRIPTDIR_FREEBSD "bin") |
43 |
# |
44 |
-SET(INSTALL_LIBDIR_FREEBSD "lib") |
45 |
-SET(INSTALL_PLUGINDIR_FREEBSD "lib/plugin") |
46 |
+SET(INSTALL_LIBDIR_FREEBSD "lib/mysql") |
47 |
+SET(INSTALL_PLUGINDIR_FREEBSD "lib/mysql/plugin") |
48 |
# |
49 |
-SET(INSTALL_INCLUDEDIR_FREEBSD "include") |
50 |
+SET(INSTALL_INCLUDEDIR_FREEBSD "include/mysql") |
51 |
# |
52 |
-SET(INSTALL_DOCDIR_FREEBSD "docs") |
53 |
-SET(INSTALL_DOCREADMEDIR_FREEBSD ".") |
54 |
+SET(INSTALL_DOCDIR_FREEBSD "share/doc/mysql") |
55 |
+SET(INSTALL_DOCREADMEDIR_FREEBSD "share/doc/mysql") |
56 |
SET(INSTALL_MANDIR_FREEBSD "man") |
57 |
-SET(INSTALL_INFODIR_FREEBSD "docs") |
58 |
+SET(INSTALL_INFODIR_FREEBSD "info") |
59 |
# |
60 |
SET(INSTALL_SHAREDIR_FREEBSD "share") |
61 |
-SET(INSTALL_MYSQLSHAREDIR_FREEBSD "share") |
62 |
-SET(INSTALL_MYSQLTESTDIR_FREEBSD "mysql-test") |
63 |
-SET(INSTALL_SUPPORTFILESDIR_FREEBSD "support-files") |
64 |
+SET(INSTALL_MYSQLSHAREDIR_FREEBSD "share/mysql") |
65 |
+SET(INSTALL_MYSQLTESTDIR_FREEBSD "share/mysql/tests") |
66 |
+SET(INSTALL_SUPPORTFILESDIR_FREEBSD "share/mysql") |
67 |
# |
68 |
-SET(INSTALL_MYSQLDATADIR_FREEBSD "data") |
69 |
-SET(INSTALL_MYSQLKEYRINGDIR_FREEBSD "keyring") |
70 |
+SET(INSTALL_MYSQLDATADIR_FREEBSD "/var/db/mysql") |
71 |
+SET(INSTALL_MYSQLKEYRINGDIR_FREEBSD "etc/mysql/keyring") |
72 |
SET(INSTALL_PLUGINTESTDIR_FREEBSD ${plugin_tests}) |
73 |
SET(INSTALL_SECURE_FILE_PRIVDIR_FREEBSD ${secure_file_priv_path}) |
74 |
SET(INSTALL_SECURE_FILE_PRIV_EMBEDDEDDIR_FREEBSD ${secure_file_priv_embedded_path}) |