diff options
| author | Jakub Hrozek <jhrozek@redhat.com> | 2015-06-16 13:00:42 +0200 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-06-16 18:27:19 +0200 |
| commit | a5bb518446d5ce565d7ba819590a009cabb0b0b4 (patch) | |
| tree | 5cb664f440cdced2a930f9a26c9d627e8579ce21 | |
| parent | 7abec79ff6eeaff043c995bbb0a152ca3e0744e7 (diff) | |
| download | sssd-a5bb518446d5ce565d7ba819590a009cabb0b0b4.tar.gz sssd-a5bb518446d5ce565d7ba819590a009cabb0b0b4.tar.xz sssd-a5bb518446d5ce565d7ba819590a009cabb0b0b4.zip | |
CONFIG: Add SSS_STATEDIR as VARDIR/lib/sss
Reviewed-by: Michal Židek <mzidek@redhat.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/conf_macros.m4 | 10 | ||||
| -rw-r--r-- | src/tests/cwrap/Makefile.am | 1 |
3 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 2904ce776..a2db8e19f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,6 +54,7 @@ sssddatadir = $(datadir)/sssd sssdapiplugindir = $(sssddatadir)/sssd.api.d dbuspolicydir = $(sysconfdir)/dbus-1/system.d dbusservicedir = $(datadir)/dbus-1/system-services +sss_statedir = $(localstatedir)/lib/sss localedir = @localedir@ nsslibdir = @nsslibdir@ pamlibdir = @pammoddir@ @@ -405,6 +406,7 @@ AM_CPPFLAGS = \ $(JOURNALD_CFLAGS) \ -DLIBDIR=\"$(libdir)\" \ -DVARDIR=\"$(localstatedir)\" \ + -DSSS_STATEDIR=\"$(sss_statedir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DSHLIBEXT=\"$(SHLIBEXT)\" \ -DSSSD_LIBEXEC_PATH=\"$(sssdlibexecdir)\" \ diff --git a/src/conf_macros.m4 b/src/conf_macros.m4 index eeba01e1b..c6ce00059 100644 --- a/src/conf_macros.m4 +++ b/src/conf_macros.m4 @@ -5,7 +5,7 @@ AC_DEFUN([WITH_DB_PATH], ) ] ) - config_dbpath="\"VARDIR\"/lib/sss/db" + config_dbpath="\"SSS_STATEDIR\"/db" dbpath="${localstatedir}/lib/sss/db" if test x"$with_db_path" != x; then config_dbpath=$with_db_path @@ -73,7 +73,7 @@ AC_DEFUN([WITH_PUBCONF_PATH], ) ] ) - config_pubconfpath="\"VARDIR\"/lib/sss/pubconf" + config_pubconfpath="\"SSS_STATEDIR\"/pubconf" pubconfpath="${localstatedir}/lib/sss/pubconf" if test x"$with_pubconf_path" != x; then config_pubconfpath=$with_pubconf_path @@ -90,7 +90,7 @@ AC_DEFUN([WITH_PIPE_PATH], ) ] ) - config_pipepath="\"VARDIR\"/lib/sss/pipes" + config_pipepath="\"SSS_STATEDIR\"/pipes" pipepath="${localstatedir}/lib/sss/pipes" if test x"$with_pipe_path" != x; then config_pipepath=$with_pipe_path @@ -107,7 +107,7 @@ AC_DEFUN([WITH_MCACHE_PATH], ) ] ) - config_mcpath="\"VARDIR\"/lib/sss/mc" + config_mcpath="\"SSS_STATEDIR\"/mc" mcpath="${localstatedir}/lib/sss/mc" if test x"$with_mcache_path" != x; then config_mcpath=$with_mcache_path @@ -491,7 +491,7 @@ AC_DEFUN([WITH_GPO_CACHE_PATH], ) ] ) - config_gpocachepath="\"VARDIR\"/lib/sss/gpo_cache" + config_gpocachepath="\"SSS_STATEDIR\"/gpo_cache" gpocachepath="${localstatedir}/lib/sss/gpo_cache" if test x"$with_gpo_cache_path" != x; then config_gpocachepath=$with_gpo_cache_path diff --git a/src/tests/cwrap/Makefile.am b/src/tests/cwrap/Makefile.am index b805e8349..46f815ab5 100644 --- a/src/tests/cwrap/Makefile.am +++ b/src/tests/cwrap/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -DLOCALEDIR=\"$(localedir)\" \ -DLIBDIR=\"$(libdir)\" \ -DVARDIR=\"$(localstatedir)\" \ + -DSSS_STATEDIR=\"$(localstatedir)/lib/sss\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ $(DBUS_CFLAGS) \ $(GLIB2_CFLAGS) \ |