Fixed some hard-coded paths being used instead of CMake variable values.
This commit is contained in:
@ -2,11 +2,12 @@
|
|||||||
|
|
||||||
|
|
||||||
# Create directories
|
# Create directories
|
||||||
mkdir -p @MAXSCALE_LIBDIR@
|
mkdir -p @CMAKE_INSTALL_PREFIX@/@MAXSCALE_LIBDIR@
|
||||||
mkdir -p @MAXSCALE_BINDIR@
|
mkdir -p @CMAKE_INSTALL_PREFIX@/@MAXSCALE_BINDIR@
|
||||||
mkdir -p @MAXSCALE_SHAREDIR@
|
mkdir -p @CMAKE_INSTALL_PREFIX@/@MAXSCALE_SHAREDIR@
|
||||||
mkdir -p @MAXSCALE_DOCDIR@
|
mkdir -p @CMAKE_INSTALL_PREFIX@/@MAXSCALE_DOCDIR@
|
||||||
mkdir -p @MAXSCALE_CONFDIR@
|
|
||||||
|
# MAXSCALE_VARDIR is an absolute path to /var by default
|
||||||
mkdir -p @MAXSCALE_VARDIR@/log/maxscale
|
mkdir -p @MAXSCALE_VARDIR@/log/maxscale
|
||||||
mkdir -p @MAXSCALE_VARDIR@/lib/maxscale
|
mkdir -p @MAXSCALE_VARDIR@/lib/maxscale
|
||||||
mkdir -p @MAXSCALE_VARDIR@/cache/maxscale
|
mkdir -p @MAXSCALE_VARDIR@/cache/maxscale
|
||||||
|
@ -24,11 +24,11 @@
|
|||||||
/** Default file locations, configured by CMake */
|
/** Default file locations, configured by CMake */
|
||||||
static const char* default_cnf_fname = "maxscale.cnf";
|
static const char* default_cnf_fname = "maxscale.cnf";
|
||||||
static const char* default_configdir = "/etc/";
|
static const char* default_configdir = "/etc/";
|
||||||
static const char* default_piddir = "/var/run/maxscale/";
|
static const char* default_piddir = "@MAXSCALE_VARDIR@/run/maxscale/";
|
||||||
static const char* default_logdir = "/var/log/maxscale/";
|
static const char* default_logdir = "@MAXSCALE_VARDIR@/log/maxscale/";
|
||||||
static const char* default_datadir = "/var/lib/maxscale/";
|
static const char* default_datadir = "@MAXSCALE_VARDIR@/lib/maxscale/";
|
||||||
static const char* default_libdir = "@CMAKE_INSTALL_PREFIX@/@MAXSCALE_LIBDIR@";
|
static const char* default_libdir = "@CMAKE_INSTALL_PREFIX@/@MAXSCALE_LIBDIR@";
|
||||||
static const char* default_cachedir = "/var/cache/maxscale/";
|
static const char* default_cachedir = "@MAXSCALE_VARDIR@/cache/maxscale/";
|
||||||
static const char* default_langdir = "@MAXSCALE_VARDIR@/lib/maxscale/";
|
static const char* default_langdir = "@MAXSCALE_VARDIR@/lib/maxscale/";
|
||||||
|
|
||||||
static char* configdir = NULL;
|
static char* configdir = NULL;
|
||||||
|
Reference in New Issue
Block a user