diff options
| author | megamage <none@none> | 2009-01-29 20:45:05 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-29 20:45:05 -0600 |
| commit | 282fdeed2b8f3fb12861264a9a458f02d8f132ad (patch) | |
| tree | fbec8bc638d877672fcd46e08ecfb0e73a926d07 | |
| parent | 440f5ed90c83c12b3d569672eec9f6dc20320435 (diff) | |
| parent | b9e0bce6b50c0241f19bf3abd0ac4f1db7bf503e (diff) | |
*Merge.
--HG--
branch : trunk
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | sql/characters.sql | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 551a8632948..d0461e2d2ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,11 +49,12 @@ if(CONF_DIR) else(CONF_DIR) SET(CONF_DIR ${PREFIX}/etc) endif(CONF_DIR) +SET(LIBSDIR ${CMAKE_INSTALL_PREFIX}/lib) message("* Will install to: ${CMAKE_INSTALL_PREFIX}") message("* With config dir at: ${CONF_DIR}") +message("* Libs install dir at: ${LIBSDIR}") -SET(LIBSDIR ${CMAKE_INSTALL_PREFIX}/lib) FIND_LIBRARY(SSLLIB NAMES ssl DOC "SSL library") FIND_LIBRARY(ZLIB z "Zlib library") diff --git a/sql/characters.sql b/sql/characters.sql index 152d597ee19..fcd5cc08ffc 100644 --- a/sql/characters.sql +++ b/sql/characters.sql @@ -774,7 +774,6 @@ LOCK TABLES `character_tutorial` WRITE; UNLOCK TABLES; -- - `arena_pending_points` int (10) UNSIGNED NOT NULL default '0', -- Table structure for table `corpse` -- |