Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
651aeb62
Commit
651aeb62
authored
Mar 25, 2010
by
Jonathan Perkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add INSTALL_INFODIR and use it to install mysql.info into the
correct location.
parent
21dbbe75
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
CMakeLists.txt
CMakeLists.txt
+5
-4
cmake/install_layout.cmake
cmake/install_layout.cmake
+4
-0
No files found.
CMakeLists.txt
View file @
651aeb62
...
@@ -277,8 +277,8 @@ INCLUDE(CPack)
...
@@ -277,8 +277,8 @@ INCLUDE(CPack)
INSTALL
(
FILES COPYING EXCEPTIONS-CLIENT LICENSE.mysql DESTINATION
${
INSTALL_DOCREADMEDIR
}
OPTIONAL
)
INSTALL
(
FILES COPYING EXCEPTIONS-CLIENT LICENSE.mysql DESTINATION
${
INSTALL_DOCREADMEDIR
}
OPTIONAL
)
INSTALL
(
FILES README DESTINATION
${
INSTALL_DOCREADMEDIR
}
)
INSTALL
(
FILES README DESTINATION
${
INSTALL_DOCREADMEDIR
}
)
IF
(
UNIX
)
IF
(
UNIX
)
INSTALL
(
FILES Docs/
INSTALL-BINARY DESTINATION
INSTALL
(
FILES Docs/
mysql.info DESTINATION
${
INSTALL_INFODIR
}
)
${
INSTALL_DOCREADMEDIR
}
)
INSTALL
(
FILES Docs/INSTALL-BINARY DESTINATION
${
INSTALL_DOCREADMEDIR
}
)
ENDIF
()
ENDIF
()
# MYSQL_DOCS_LOCATON is used in "make dist", points to the documentation directory
# MYSQL_DOCS_LOCATON is used in "make dist", points to the documentation directory
SET
(
MYSQL_DOCS_LOCATION
""
CACHE PATH
"Location from where documentation is copied"
)
SET
(
MYSQL_DOCS_LOCATION
""
CACHE PATH
"Location from where documentation is copied"
)
...
@@ -286,8 +286,9 @@ MARK_AS_ADVANCED(MYSQL_DOCS_LOCATION)
...
@@ -286,8 +286,9 @@ MARK_AS_ADVANCED(MYSQL_DOCS_LOCATION)
INSTALL
(
DIRECTORY Docs/ DESTINATION
${
INSTALL_DOCDIR
}
INSTALL
(
DIRECTORY Docs/ DESTINATION
${
INSTALL_DOCDIR
}
PATTERN
"INSTALL-BINARY"
EXCLUDE
PATTERN
"INSTALL-BINARY"
EXCLUDE
PATTERN
"Makefile.*"
EXCLUDE
PATTERN
"Makefile.*"
EXCLUDE
PATTERN
"myisam.txt"
EXCLUDE
PATTERN
"glibc*"
EXCLUDE
PATTERN
"glibc*"
EXCLUDE
PATTERN
"sp-imp-spec.txt"
EXCLUDE
PATTERN
"linuxthreads.txt"
EXCLUDE
PATTERN
"linuxthreads.txt"
EXCLUDE
PATTERN
"myisam.txt"
EXCLUDE
PATTERN
"mysql.info"
EXCLUDE
PATTERN
"sp-imp-spec.txt"
EXCLUDE
)
)
cmake/install_layout.cmake
View file @
651aeb62
...
@@ -98,6 +98,7 @@ SET(INSTALL_INCLUDEDIR_STANDALONE "include")
...
@@ -98,6 +98,7 @@ SET(INSTALL_INCLUDEDIR_STANDALONE "include")
SET
(
INSTALL_PLUGINDIR_STANDALONE
"lib/plugin"
)
SET
(
INSTALL_PLUGINDIR_STANDALONE
"lib/plugin"
)
SET
(
INSTALL_DOCDIR_STANDALONE
"docs"
)
SET
(
INSTALL_DOCDIR_STANDALONE
"docs"
)
SET
(
INSTALL_MANDIR_STANDALONE
"man"
)
SET
(
INSTALL_MANDIR_STANDALONE
"man"
)
SET
(
INSTALL_INFODIR_STANDALONE
"docs"
)
SET
(
INSTALL_MYSQLSHAREDIR_STANDALONE
"share"
)
SET
(
INSTALL_MYSQLSHAREDIR_STANDALONE
"share"
)
SET
(
INSTALL_SHAREDIR_STANDALONE
"share"
)
SET
(
INSTALL_SHAREDIR_STANDALONE
"share"
)
SET
(
INSTALL_SCRIPTDIR_STANDALONE
"scripts"
)
SET
(
INSTALL_SCRIPTDIR_STANDALONE
"scripts"
)
...
@@ -122,6 +123,7 @@ SET(INSTALL_SHAREDIR_RPM "share")
...
@@ -122,6 +123,7 @@ SET(INSTALL_SHAREDIR_RPM "share")
#
#
SET
(
INSTALL_DOCDIR_RPM
"
${
INSTALL_SHAREDIR_RPM
}
/mysql/doc/MySQL-server-
${
MYSQL_NO_DASH_VERSION
}
"
)
SET
(
INSTALL_DOCDIR_RPM
"
${
INSTALL_SHAREDIR_RPM
}
/mysql/doc/MySQL-server-
${
MYSQL_NO_DASH_VERSION
}
"
)
SET
(
INSTALL_DOCREADMEDIR_RPM
"
${
INSTALL_DOCDIR_RPM
}
"
)
SET
(
INSTALL_DOCREADMEDIR_RPM
"
${
INSTALL_DOCDIR_RPM
}
"
)
SET
(
INSTALL_INFODIR_RPM
"
${
INSTALL_SHAREDIR_RPM
}
/info"
)
SET
(
INSTALL_MANDIR_RPM
"
${
INSTALL_SHAREDIR_RPM
}
/man"
)
SET
(
INSTALL_MANDIR_RPM
"
${
INSTALL_SHAREDIR_RPM
}
/man"
)
SET
(
INSTALL_MYSQLDATADIR_RPM
"var"
)
SET
(
INSTALL_MYSQLDATADIR_RPM
"var"
)
SET
(
INSTALL_MYSQLSHAREDIR_RPM
"
${
INSTALL_SHAREDIR_RPM
}
/mysql"
)
SET
(
INSTALL_MYSQLSHAREDIR_RPM
"
${
INSTALL_SHAREDIR_RPM
}
/mysql"
)
...
@@ -139,6 +141,7 @@ SET(INSTALL_INCLUDEDIR_DEB "include")
...
@@ -139,6 +141,7 @@ SET(INSTALL_INCLUDEDIR_DEB "include")
SET
(
INSTALL_PLUGINDIR_DEB
"lib/plugin"
)
SET
(
INSTALL_PLUGINDIR_DEB
"lib/plugin"
)
SET
(
INSTALL_DOCDIR_DEB
"docs"
)
SET
(
INSTALL_DOCDIR_DEB
"docs"
)
SET
(
INSTALL_MANDIR_DEB
"man"
)
SET
(
INSTALL_MANDIR_DEB
"man"
)
SET
(
INSTALL_INFODIR_DEB
"docs"
)
SET
(
INSTALL_MYSQLSHAREDIR_DEB
"share"
)
SET
(
INSTALL_MYSQLSHAREDIR_DEB
"share"
)
SET
(
INSTALL_SHAREDIR_DEB
"share"
)
SET
(
INSTALL_SHAREDIR_DEB
"share"
)
SET
(
INSTALL_SCRIPTDIR_DEB
"scripts"
)
SET
(
INSTALL_SCRIPTDIR_DEB
"scripts"
)
...
@@ -156,6 +159,7 @@ SET(INSTALL_INCLUDEDIR_SVR4 "include")
...
@@ -156,6 +159,7 @@ SET(INSTALL_INCLUDEDIR_SVR4 "include")
SET
(
INSTALL_PLUGINDIR_SVR4
"lib/plugin"
)
SET
(
INSTALL_PLUGINDIR_SVR4
"lib/plugin"
)
SET
(
INSTALL_DOCDIR_SVR4
"docs"
)
SET
(
INSTALL_DOCDIR_SVR4
"docs"
)
SET
(
INSTALL_MANDIR_SVR4
"man"
)
SET
(
INSTALL_MANDIR_SVR4
"man"
)
SET
(
INSTALL_INFODIR_SVR4
"docs"
)
SET
(
INSTALL_MYSQLSHAREDIR_SVR4
"share"
)
SET
(
INSTALL_MYSQLSHAREDIR_SVR4
"share"
)
SET
(
INSTALL_SHAREDIR_SVR4
"share"
)
SET
(
INSTALL_SHAREDIR_SVR4
"share"
)
SET
(
INSTALL_SCRIPTDIR_SVR4
"scripts"
)
SET
(
INSTALL_SCRIPTDIR_SVR4
"scripts"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment