diff --git a/src/game/Makefile.am b/src/game/Makefile.am index 65be340dc..ad3315dac 100644 --- a/src/game/Makefile.am +++ b/src/game/Makefile.am @@ -19,7 +19,7 @@ ## Sub-directories to parse ## CPP flags for includes, defines, etc. -AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(srcdir)/../../dep/include -I$(srcdir)/../framework -I$(srcdir)/../shared -I$(srcdir)/../shared/vmap -I$(srcdir)/../realmd +AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(srcdir)/../../dep/include -I$(srcdir)/../framework -I$(srcdir)/../shared -I$(srcdir)/../shared/vmap -I$(srcdir)/../realmd -DSYSCONFDIR=\"$(sysconfdir)/\" ## Build MaNGOS game library as convenience library. # All libraries will be convenience libraries. Might be changed to shared diff --git a/src/mangosd/Makefile.am b/src/mangosd/Makefile.am index f876d08f4..f93316fad 100644 --- a/src/mangosd/Makefile.am +++ b/src/mangosd/Makefile.am @@ -17,7 +17,7 @@ ## Process this file with automake to produce Makefile.in ## CPP flags for includes, defines, etc. -AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir)/../../dep/include -I$(srcdir)/../framework -I$(srcdir)/../shared -I$(srcdir)/../game -I$(srcdir) +AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir)/../../dep/include -I$(srcdir)/../framework -I$(srcdir)/../shared -I$(srcdir)/../game -I$(srcdir) -DSYSCONFDIR=\"$(sysconfdir)/\" ## Build world list daemon as standalone program bin_PROGRAMS = mangos-worldd diff --git a/src/realmd/Makefile.am b/src/realmd/Makefile.am index 31bc7c470..8930f5445 100644 --- a/src/realmd/Makefile.am +++ b/src/realmd/Makefile.am @@ -17,7 +17,7 @@ ## Process this file with automake to produce Makefile.in ## CPP flags for includes, defines, etc. -AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir)/../../dep/include -I$(srcdir)/../framework -I$(srcdir)/../shared -I$(srcdir) +AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir)/../../dep/include -I$(srcdir)/../framework -I$(srcdir)/../shared -I$(srcdir) -DSYSCONFDIR=\"$(sysconfdir)/\" ## Build realm list daemon as standalone program bin_PROGRAMS = mangos-realmd diff --git a/src/shared/Makefile.am b/src/shared/Makefile.am index 9418cbd37..225f4eb4c 100644 --- a/src/shared/Makefile.am +++ b/src/shared/Makefile.am @@ -20,7 +20,7 @@ SUBDIRS = Auth Config Database vmap ## CPP flags for includes, defines, etc. -AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(srcdir)/../../dep/include -I$(srcdir)/../framework -I$(srcdir)/../shared -I$(srcdir)/../../dep/include/g3dlite +AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(srcdir)/../../dep/include -I$(srcdir)/../framework -I$(srcdir)/../shared -I$(srcdir)/../../dep/include/g3dlite -DSYSCONFDIR=\"$(sysconfdir)/\" ## AM_CPPFLAGS += -I$(srcdir)/../game -I$(srcdir)/../realmd ## Build MaNGOS shared library and its parts as convenience library. diff --git a/src/shared/SystemConfig.h.in b/src/shared/SystemConfig.h.in index 12d494c7b..d669f9bbc 100644 --- a/src/shared/SystemConfig.h.in +++ b/src/shared/SystemConfig.h.in @@ -49,18 +49,23 @@ # define _ENDIAN_STRING "little-endian" #endif +// The path to config files +#ifndef SYSCONFDIR +# define SYSCONFDIR "" +#endif + #if PLATFORM == PLATFORM_WINDOWS # ifdef _WIN64 # define _FULLVERSION _PACKAGENAME "/" _VERSION " (Win64," _ENDIAN_STRING ")" # else # define _FULLVERSION _PACKAGENAME "/" _VERSION " (Win32," _ENDIAN_STRING ")" # endif -# define _MANGOSD_CONFIG "mangosd.conf" -# define _REALMD_CONFIG "realmd.conf" +# define _MANGOSD_CONFIG SYSCONFDIR"mangosd.conf" +# define _REALMD_CONFIG SYSCONFDIR"realmd.conf" #else # define _FULLVERSION _PACKAGENAME "/" _VERSION " (Unix," _ENDIAN_STRING ")" -# define _MANGOSD_CONFIG "@sysconfdir@/mangosd.conf" -# define _REALMD_CONFIG "@sysconfdir@/realmd.conf" +# define _MANGOSD_CONFIG SYSCONFDIR"mangosd.conf" +# define _REALMD_CONFIG SYSCONFDIR"realmd.conf" #endif #define DEFAULT_PLAYER_LIMIT 100