rename minikonoha => konoha

konoha-project · Feb 6, 2013 · 3504280 · 3504280
1 parent 9218c48
commit 3504280
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -285,12 +285,6 @@ endforeach(f ${test_files})
 add_subdirectory(src/exec/apache)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cpack.cmake)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/konoha.sh
-	DESTINATION bin
-	RENAME konoha
-	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-	GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-
 install(TARGETS konoha konoha_bin
 		RUNTIME DESTINATION bin
 		LIBRARY DESTINATION lib${LIB_SUFFIX}

diff --git a/include/konoha/konoha.h b/include/konoha/konoha.h
@@ -51,7 +51,7 @@ extern "C" {
 #endif
 
 #ifndef K_PROGNAME
-#define K_PROGNAME  "Mini Konoha"
+#define K_PROGNAME  "Konoha"
 /* - 2012/06/14 */
 //#define K_CODENAME "Miyajima"
 /*2012/06/14 -  */

diff --git a/src/module-devel/CMakeLists.txt b/src/module-devel/CMakeLists.txt
@@ -7,7 +7,7 @@ macro(GET_MODULE_NAME _STR _RESULT)
 endmacro()
 
 set(KONOHA_MODULE_DIR
-	"lib/minikonoha/${SO_VERSION}/module/${ModuleName}")
+	"lib/konoha/${SO_VERSION}/module/${ModuleName}")
 
 macro(add_konoha_module ModuleName)
 	#MESSAGE(STATUS "Compiling ${ModuleName} Module")

diff --git a/src/module/CMakeLists.txt b/src/module/CMakeLists.txt
@@ -7,7 +7,7 @@ macro(GET_MODULE_NAME _STR _RESULT)
 endmacro()
 
 set(KONOHA_MODULE_DIR
-	"lib/minikonoha/${SO_VERSION}/module/${ModuleName}")
+	"lib/konoha/${SO_VERSION}/module/${ModuleName}")
 
 macro(add_konoha_module ModuleName)
 	#MESSAGE(STATUS "Compiling ${ModuleName} Module")

diff --git a/src/package-devel/CMakeLists.txt b/src/package-devel/CMakeLists.txt
@@ -47,7 +47,7 @@ macro(add_konoha_package _PKGNAME)
 		set(LIB  "${_PACKAGE_NAME}_glue")
 		set(_PACKAGE_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 		set(_PACKAGE_STRING  ${CMAKE_PROJECT_NAME}-${_PACKAGE_VERSION})
-		set(_KONOHA_PACKAGE_DIR lib/minikonoha/${SO_VERSION}/package/${KONOHA_VERSION}/${PROJECT_NAME})
+		set(_KONOHA_PACKAGE_DIR lib/konoha/${SO_VERSION}/package/${KONOHA_VERSION}/${PROJECT_NAME})
 		set(CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}
 			"${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${PACKAGE_C_FLAGS}")
 		set(CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}

diff --git a/src/package/CMakeLists.txt b/src/package/CMakeLists.txt
@@ -47,7 +47,7 @@ macro(add_konoha_package _PKGNAME)
 		set(LIB  "${_PACKAGE_NAME}_glue")
 		set(_PACKAGE_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 		set(_PACKAGE_STRING  ${CMAKE_PROJECT_NAME}-${_PACKAGE_VERSION})
-		set(_KONOHA_PACKAGE_DIR lib/minikonoha/${SO_VERSION}/package/${KONOHA_VERSION}/${PROJECT_NAME})
+		set(_KONOHA_PACKAGE_DIR lib/konoha/${SO_VERSION}/package/${KONOHA_VERSION}/${PROJECT_NAME})
 		set(CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}
 			"${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${PACKAGE_C_FLAGS}")
 		set(CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}