summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt12
-rwxr-xr-xcompile_debug.sh2
-rwxr-xr-xcompile_release.sh2
-rwxr-xr-xinstall_debug.sh2
-rwxr-xr-xinstall_release.sh2
-rw-r--r--src/ipcpd/normal/CMakeLists.txt2
6 files changed, 11 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b5f5e85..ba900645 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,12 +2,6 @@ cmake_minimum_required(VERSION 2.8.12.2)
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
- "${CMAKE_INSTALL_PREFIX}/usr/lib" isSystemDir)
-IF("${isSystemDir}" STREQUAL "-1")
- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/usr/lib")
-ENDIF("${isSystemDir}" STREQUAL "-1")
-
project(ouroboros C)
include(GitVersionGen)
@@ -29,6 +23,12 @@ SET(CMAKE_SKIP_BUILD_RPATH FALSE)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+ "${CMAKE_INSTALL_PREFIX}/usr/lib" isSystemDir)
+IF("${isSystemDir}" STREQUAL "-1")
+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/usr/lib")
+ENDIF("${isSystemDir}" STREQUAL "-1")
+
message(STATUS "Package name is: ${PACKAGE_NAME}")
message(STATUS "Package description is: ${PACKAGE_DESCRIPTION}")
message(STATUS "Package version is: ${PACKAGE_VERSION}")
diff --git a/compile_debug.sh b/compile_debug.sh
index 484f1076..3ea1e039 100755
--- a/compile_debug.sh
+++ b/compile_debug.sh
@@ -6,7 +6,7 @@ if (($# == 1 ))
then
PREFIX=`echo "$1"|sed -e "s,\/$,,"`
else
- PREFIX="/usr/local/ouroboros/"
+ PREFIX="/usr/local/ouroboros"
fi
BUILDDIR=build
diff --git a/compile_release.sh b/compile_release.sh
index 0b1c1a96..58a16e52 100755
--- a/compile_release.sh
+++ b/compile_release.sh
@@ -6,7 +6,7 @@ if (($# == 1 ))
then
PREFIX=`echo "$1"|sed -e "s,\/$,,"`
else
- PREFIX="/"
+ PREFIX=""
fi
BUILDDIR=build
diff --git a/install_debug.sh b/install_debug.sh
index 10e50706..ef6b8a30 100755
--- a/install_debug.sh
+++ b/install_debug.sh
@@ -6,7 +6,7 @@ if (($# == 1 ))
then
PREFIX=`echo "$1"|sed -e "s,\/$,,"`
else
- PREFIX="/usr/local/ouroboros/"
+ PREFIX="/usr/local/ouroboros"
fi
BUILDDIR=build
diff --git a/install_release.sh b/install_release.sh
index d2de5526..f5d08bb5 100755
--- a/install_release.sh
+++ b/install_release.sh
@@ -6,7 +6,7 @@ if (($# == 1 ))
then
PREFIX=`echo "$1"|sed -e "s,\/$,,"`
else
- PREFIX="/"
+ PREFIX=""
fi
BUILDDIR=build
diff --git a/src/ipcpd/normal/CMakeLists.txt b/src/ipcpd/normal/CMakeLists.txt
index 5c14c87a..74bd19ec 100644
--- a/src/ipcpd/normal/CMakeLists.txt
+++ b/src/ipcpd/normal/CMakeLists.txt
@@ -28,7 +28,7 @@ if (CMAKE_BUILD_TYPE MATCHES Debug)
MACRO_ADD_COMPILE_FLAGS(ipcpd-normal -DCONFIG_OUROBOROS_DEBUG)
endif (CMAKE_BUILD_TYPE MATCHES Debug)
-install(TARGETS ipcpd-normal RUNTIME DESTINATION /sbin)
+install(TARGETS ipcpd-normal RUNTIME DESTINATION sbin)
# Enable once ipcp-normal has tests
# add_subdirectory(tests)