diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-06-27 12:03:31 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-06-27 12:03:31 +0200 |
| commit | 80765f1d6ea16892224be8da954e5b0a4c53303b (patch) | |
| tree | 8d48f58b2c3590d5f5f8d7d2d46202ff945bf3cf /src/lib | |
| parent | b13d60ac083195af6caee475fb36844c5177a0cf (diff) | |
| download | ouroboros-80765f1d6ea16892224be8da954e5b0a4c53303b.tar.gz ouroboros-80765f1d6ea16892224be8da954e5b0a4c53303b.zip | |
build: Fix installation prefix
The installation prefix was taking a trailing backslash, while it is
common not to do so. Fixed it so that any trailing backslash is
removed by the compilation and installation scripts.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/lib/ipcp.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 2a75ef17..8803fc3b 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -50,7 +50,7 @@ if (CMAKE_BUILD_TYPE MATCHES Debug) MACRO_ADD_COMPILE_FLAGS(ouroboros -DCONFIG_OUROBOROS_DEBUG) endif (CMAKE_BUILD_TYPE MATCHES Debug) -install(TARGETS ouroboros LIBRARY DESTINATION usr/lib) +install(TARGETS ouroboros LIBRARY DESTINATION /usr/lib) target_include_directories(ouroboros PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/src/lib/ipcp.c b/src/lib/ipcp.c index 730880f9..77263bcf 100644 --- a/src/lib/ipcp.c +++ b/src/lib/ipcp.c @@ -105,7 +105,7 @@ pid_t ipcp_create(char * ipcp_name, pid_t pid = 0; char irmd_pid[10]; size_t len = 0; - char * ipcp_dir = "sbin/"; + char * ipcp_dir = "/sbin/"; char * full_name = NULL; char * exec_name = NULL; @@ -132,7 +132,7 @@ pid_t ipcp_create(char * ipcp_name, else exit(EXIT_FAILURE); - len += strlen(INSTALL_DIR); + len += strlen(INSTALL_PREFIX); len += strlen(ipcp_dir); len += strlen(exec_name); len += 1; @@ -143,7 +143,7 @@ pid_t ipcp_create(char * ipcp_name, exit(EXIT_FAILURE); } - strcpy(full_name, INSTALL_DIR); + strcpy(full_name, INSTALL_PREFIX); strcat(full_name, ipcp_dir); strcat(full_name, exec_name); full_name[len] = '\0'; |