From f095ec353c806090690320c7e6093b63504c6bb4 Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Fri, 10 Jul 2015 21:31:33 +0300 Subject: [PATCH] Fixed config file being installed into /usr/etc instead of /etc. --- cmake/install_layout.cmake | 5 ++--- server/core/adminusers.c | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index e25bd0a8d..a14ef05c5 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -5,8 +5,7 @@ set(MAXSCALE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/maxscale CACHE PATH "Library install set(MAXSCALE_BINDIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Executable installation path") set(MAXSCALE_SHAREDIR ${CMAKE_INSTALL_DATADIR}/maxscale CACHE PATH "Share file installation path, includes licence and readme files") set(MAXSCALE_DOCDIR ${CMAKE_INSTALL_DOCDIR}/maxscale CACHE PATH "Documentation installation path, text versions only") -set(MAXSCALE_CONFDIR ${CMAKE_INSTALL_SYSCONFDIR} CACHE PATH "Configuration file installation path, this is not usually needed") -# This is the only hard-coded absolute path +# These are the only hard-coded absolute paths set(MAXSCALE_VARDIR /var CACHE PATH "Data file path (usually /var/)") - +set(MAXSCALE_CONFDIR /etc CACHE PATH "Configuration file installation path (/etc/)") diff --git a/server/core/adminusers.c b/server/core/adminusers.c index 53734e9cc..4b3f9af21 100644 --- a/server/core/adminusers.c +++ b/server/core/adminusers.c @@ -19,7 +19,9 @@ #include #include #include -#define _XOPEN_SOURCE +#ifndef _XOPEN_SOURCE +#define _XOPEN_SOURCE 700 +#endif #include #include #include