diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-22 16:22:31 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-22 16:22:31 +0300 |
| commit | 0ceeeafe85316e594d8ba42a6d0c3c29201944bf (patch) | |
| tree | 1d77daf398f43cbe5998ff4f0676165e6808927c /sql/share | |
| parent | 7a9f2e57e3325a56434704e9ba9fc4f424678a0b (diff) | |
| parent | 4836199d701af05a9c89563b642c51ee5640e804 (diff) | |
| download | mariadb-git-0ceeeafe85316e594d8ba42a6d0c3c29201944bf.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- mysql-test/r/mysqld--help-notwin.result
- mysql-test/r/mysqld--help-win.result
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/CMakeLists.txt | 52 | ||||
| -rw-r--r-- | sql/share/Makefile.am | 5 |
2 files changed, 55 insertions, 2 deletions
diff --git a/sql/share/CMakeLists.txt b/sql/share/CMakeLists.txt new file mode 100644 index 00000000000..944120cfc24 --- /dev/null +++ b/sql/share/CMakeLists.txt @@ -0,0 +1,52 @@ +# Copyright (C) 2009 Sun Microsystems, Inc +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +SET (dirs +danish +german +slovak +dutch +greek +norwegian +spanish +english +hungarian +norwegian-ny +swedish +italian +polish +ukrainian +japanese +portuguese +romanian +estonian +korean +russian +czech +french +serbian +) + +SET(files + errmsg-utf8.txt +) + +FOREACH (dir ${dirs}) + INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dir} + DESTINATION ${INSTALL_MYSQLSHAREDIR}) +ENDFOREACH() +INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/charsets DESTINATION ${INSTALL_MYSQLSHAREDIR}) + +INSTALL(FILES ${files} DESTINATION ${INSTALL_MYSQLSHAREDIR}) diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am index 203dbe54254..da19ed1c5a7 100644 --- a/sql/share/Makefile.am +++ b/sql/share/Makefile.am @@ -15,8 +15,9 @@ ## Process this file with automake to create Makefile.in -EXTRA_DIST= errmsg-utf8.txt - +EXTRA_DIST= errmsg-utf8.txt \ + CMakeLists.txt + dist-hook: for dir in charsets @AVAILABLE_LANGUAGES@; do \ test -d $(distdir)/$$dir || mkdir $(distdir)/$$dir; \ |