null+****@clear*****
null+****@clear*****
2012年 4月 16日 (月) 22:33:40 JST
Kouhei Sutou 2012-04-16 22:33:40 +0900 (Mon, 16 Apr 2012)
New Revision: c2929cb5df2a3ac2f728724d9b29d70a4dacb5c4
Log:
cmake: support admin HTML install
Copied files:
data/html/CMakeLists.txt
(from data/CMakeLists.txt)
Modified files:
CMakeLists.txt
data/CMakeLists.txt
Modified: CMakeLists.txt (+4 -2)
===================================================================
--- CMakeLists.txt 2012-04-16 22:32:56 +0900 (3d04fb8)
+++ CMakeLists.txt 2012-04-16 22:33:40 +0900 (01504b4)
@@ -36,6 +36,8 @@ include(${CMAKE_SOURCE_DIR}/build/cmake_modules/ReadFileList.cmake)
set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
set(LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
set(INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include")
+set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
+set(GRN_DATA_DIR "${DATA_DIR}/${CMAKE_PROJECT_NAME}")
set(CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/etc")
set(GRN_CONFIG_DIR "${CONFIG_DIR}/${CMAKE_PROJECT_NAME}")
@@ -49,7 +51,7 @@ set(GRN_DEFAULT_RELATIVE_DOCUMENT_ROOT
"html/admin"
CACHE PATH "groonga default relative document root")
set(GRN_DEFAULT_DOCUMENT_ROOT
- "${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME}/${GRN_DEFAULT_RELATIVE_DOCUMENT_ROOT}"
+ "${GRN_DATA_DIR}/${GRN_DEFAULT_RELATIVE_DOCUMENT_ROOT}"
CACHE PATH "groonga default document root")
set(GRN_PLUGINS_DIR
"${LIB_DIR}/${CMAKE_PROJECT_NAME}/plugins"
@@ -263,7 +265,7 @@ set(exec_prefix "${prefix}")
set(bindir "${BIN_DIR}")
set(libdir "${LIB_DIR}")
set(includedir "${INCLUDE_DIR}")
-set(datarootdir "${prefix}/share")
+set(datarootdir "${DATA_DIR}")
set(datadir "${datarootdir}")
set(GRN_EXPANDED_DEFAULT_DOCUMENT_ROOT "${GRN_DEFAULT_DOCUMENT_ROOT}")
set(EXEEXT "${CMAKE_EXECUTABLE_SUFFIX}")
Modified: data/CMakeLists.txt (+2 -0)
===================================================================
--- data/CMakeLists.txt 2012-04-16 22:32:56 +0900 (06874bd)
+++ data/CMakeLists.txt 2012-04-16 22:33:40 +0900 (7f766ef)
@@ -13,4 +13,6 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+add_subdirectory(html)
+
install(FILES groonga.conf DESTINATION "${GRN_CONFIG_DIR}/")
Copied: data/html/CMakeLists.txt (+1 -1) 91%
===================================================================
--- data/CMakeLists.txt 2012-04-16 22:32:56 +0900 (06874bd)
+++ data/html/CMakeLists.txt 2012-04-16 22:33:40 +0900 (b6ccf55)
@@ -13,4 +13,4 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-install(FILES groonga.conf DESTINATION "${GRN_CONFIG_DIR}/")
+install(DIRECTORY admin DESTINATION "${GRN_DATA_DIR}/html")