From 80765f1d6ea16892224be8da954e5b0a4c53303b Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Mon, 27 Jun 2016 12:03:31 +0200 Subject: 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. --- include/ouroboros/CMakeLists.txt | 2 +- include/ouroboros/config.h.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/ouroboros/CMakeLists.txt b/include/ouroboros/CMakeLists.txt index c5f65d49..2ea86883 100644 --- a/include/ouroboros/CMakeLists.txt +++ b/include/ouroboros/CMakeLists.txt @@ -14,4 +14,4 @@ set(HEADER_FILES qos.h ) -install(FILES ${HEADER_FILES} DESTINATION usr/include/ouroboros) +install(FILES ${HEADER_FILES} DESTINATION /usr/include/ouroboros) diff --git a/include/ouroboros/config.h.in b/include/ouroboros/config.h.in index a20715ac..0dce7acd 100644 --- a/include/ouroboros/config.h.in +++ b/include/ouroboros/config.h.in @@ -25,7 +25,7 @@ #define PROJECT_NAME "@CMAKE_PROJECT_NAME@" #define PROJECT_VERSION "@PACKAGE_VERSION@" -#define INSTALL_DIR "@CMAKE_INSTALL_PREFIX@" +#define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" #define _POSIX_C_SOURCE 200112L #define IPCP_SHIM_UDP_EXEC "@IPCP_SHIM_UDP_TARGET@" #define IPCP_SHIM_ETH_LLC_EXEC "@IPCP_SHIM_ETH_LLC_TARGET@" -- cgit v1.2.3