install script into /usr/bin

Change-Id: I31388c6a73a5f1208fc24802697e970e728b7361
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5b87da6c16d29efbd519a948c7fe4a0000c51a6..bad71e99537ad4bdb42c73cb3a7ee706aa21df0c 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}")
 SET(VERSION_MAJOR 0)
 SET(VERSION "${VERSION_MAJOR}.2.45")
+SET(BINDIR "${PREFIX}/bin")
 
 set(CMAKE_SKIP_BUILD_RPATH true)
 
@@ -58,7 +59,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_I
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/vconf.h DESTINATION include/${PROJECT_NAME})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/vconf-keys.h DESTINATION include/${PROJECT_NAME})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/kdb_first_boot DESTINATION /opt/var/kdb)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/vconf-init DESTINATION /etc/rc.d/init.d/ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/vconf-init DESTINATION ${BINDIR}  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/vconf-setup DESTINATION /etc/preconf.d/ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
 add_subdirectory(include)

diff --git a/packaging/vconf-setup.service b/packaging/vconf-setup.service
index cd75eddfffc2f6daf1287056cd4fa2fb5ffbe532..d74ce688652f064045dfc48c9656b31b0987e062 100755 (executable)
--- a/packaging/vconf-setup.service
+++ b/packaging/vconf-setup.service
@@ -6,7 +6,7 @@ Before=basic.target
 
 [Service]
 Type=oneshot
-ExecStart=/etc/rc.d/init.d/vconf-init
+ExecStart=/usr/bin/vconf-init
 
 [Install]
 WantedBy=basic.target