summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2009-03-12 22:19:10 -0400
committerSimo Sorce <ssorce@redhat.com>2009-03-13 13:47:33 -0400
commit063ef0f15dfc32d15d2e9bdcba819906aa99b948 (patch)
treece846ec9fb4124954f76f8cb277d703037cffa7f
parent97bc7d0cb0c5fa245b2736d51295d1da0d8311e0 (diff)
downloadsssd-063ef0f15dfc32d15d2e9bdcba819906aa99b948.tar.gz
sssd-063ef0f15dfc32d15d2e9bdcba819906aa99b948.tar.xz
sssd-063ef0f15dfc32d15d2e9bdcba819906aa99b948.zip
Fix makefiles
Make so that definitions in the code and install paths actually match
-rw-r--r--server/Makefile.in24
-rw-r--r--server/conf_macros.m427
-rw-r--r--server/configure.ac6
3 files changed, 30 insertions, 27 deletions
diff --git a/server/Makefile.in b/server/Makefile.in
index f2f3f9e01..1445cc1c6 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -18,14 +18,15 @@ builddir = @builddir@
sharedbuilddir = @sharedbuilddir@
INSTALLCMD = @INSTALL@
EXTRA_OBJ=@EXTRA_OBJ@
-SSSD_LIBEXEC_PATH = @SSSD_LIBEXEC_PATH@
-SSSD_LIBDIR = $(libdir)/@PACKAGE_NAME@
-LDB_LIBDIR = $(libdir)/ldb
-SSSD_INTROSPECT_PATH = @SSSD_INTROSPECT_PATH@
+SSSD_LIBEXEC_PATH = @libexecdir@/@PACKAGE_NAME@
+SSSD_LIBDIR = @pluginpath@
+LDB_LIBDIR = @libdir@/ldb
+SSSD_INTROSPECT_PATH=@datarootdir@/@PACKAGE_NAME@/introspect
PACKAGE_VERSION = @PACKAGE_VERSION@
-srvdir = $(srcdir)
-pipepath = @pipepath@
-dbpath = @dbpath@
+srvdir = @srcdir@
+SSSD_PIPE_PATH = @pipepath@
+SSSD_DB_PATH = @dbpath@
+SSSD_PID_PATH = @pidpath@
TALLOC_LIBS = @TALLOC_LIBS@
TALLOC_CFLAGS = @TALLOC_CFLAGS@
@@ -73,8 +74,8 @@ LIBS = @LIBS@ $(TALLOC_LIBS) $(TDB_LIBS) $(TEVENT_LIBS) $(POPT_LIBS) $(LDB_LIBS)
PICFLAG = @PICFLAG@
CFLAGS += -g -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \
$(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) $(TEVENT_CFLAGS) $(LDB_CFLAGS) $(DBUS_CFLAGS) $(CHECK_CFLAGS)\
- -DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"$(SHLIBEXT)\" -DSSSD_LIBEXEC_PATH=\"$(SSSD_LIBEXEC_PATH)\" -DSSSD_INTROSPECT_PATH=\"$(SSSD_INTROSPECT_PATH)\"\
- -DUSE_MMAP=1 @CFLAGS@
+ -DLIBDIR=\"$(libdir)\" -DVARDIR=\"$(localstatedir)\" -DSHLIBEXT=\"$(SHLIBEXT)\" -DSSSD_LIBEXEC_PATH=\"$(SSSD_LIBEXEC_PATH)\"\
+ -DSSSD_INTROSPECT_PATH=\"$(SSSD_INTROSPECT_PATH)\" -DUSE_MMAP=1 @CFLAGS@
MDLD = @MDLD@
MDLD_FLAGS = @MDLD_FLAGS@
@@ -174,8 +175,9 @@ installdirs::
$(DESTDIR)$(LDB_LIBDIR) \
$(DESTDIR)$(DBUS_SYSBUS_POLICY_DIR) \
$(DESTDIR)$(SSSD_INTROSPECT_PATH)/infopipe \
- $(DESTDIR)$(pipepath)/private \
- $(DESTDIR)$(dbpath)
+ $(DESTDIR)$(SSSD_PIPE_PATH)/private \
+ $(DESTDIR)$(SSSD_DB_PATH) \
+ $(DESTDIR)$(SSSD_PID_PATH)
installheaders:: installdirs
ifneq (x$(headers), x)
diff --git a/server/conf_macros.m4 b/server/conf_macros.m4
index 3d8f41a7f..f6821e070 100644
--- a/server/conf_macros.m4
+++ b/server/conf_macros.m4
@@ -5,12 +5,14 @@ AC_DEFUN(WITH_DB_PATH,
)
]
)
- dbpath="/var/lib/sss/db"
+ config_dbpath="\"VARDIR\"/lib/sss/db"
+ dbpath="${localstatedir}/lib/sss/db"
if test x"$with_db_path" != x; then
+ config_dbpath=$with_db_path
dbpath=$with_db_path
fi
AC_SUBST(dbpath)
- AC_DEFINE_UNQUOTED(DB_PATH, "$dbpath", [Path to the SSSD databases])
+ AC_DEFINE_UNQUOTED(DB_PATH, "$config_dbpath", [Path to the SSSD databases])
])
AC_DEFUN(WITH_PLUGIN_PATH,
@@ -20,12 +22,14 @@ AC_DEFUN(WITH_PLUGIN_PATH,
)
]
)
- pluginpath="/usr/lib/sssd"
+ pluginpath="${libdir}/sssd"
+ config_pluginpath="\"LIBDIR\"/sssd"
if test x"$with_plugin_path" != x; then
pluginpath=$with_plugin_path
+ config_pluginpath=$with_plugin_path
fi
AC_SUBST(pluginpath)
- AC_DEFINE_UNQUOTED(DATA_PROVIDER_PLUGINS_PATH, "$pluginpath", [Path to the SSSD data provider plugins])
+ AC_DEFINE_UNQUOTED(DATA_PROVIDER_PLUGINS_PATH, "$config_pluginpath", [Path to the SSSD data provider plugins])
])
AC_DEFUN(WITH_PID_PATH,
@@ -35,12 +39,14 @@ AC_DEFUN(WITH_PID_PATH,
)
]
)
- pidpath="/var/run"
+ config_pidpath="\"VARDIR\"/run"
+ pidpath="${localstatedir}/run"
if test x"$with_pid_path" != x; then
+ config_pidpath=$with_pid_path
pidpath=$with_pid_path
fi
AC_SUBST(pidpath)
- AC_DEFINE_UNQUOTED(PID_PATH, "$pidpath", [Where to store pid files for the SSSD])
+ AC_DEFINE_UNQUOTED(PID_PATH, "$config_pidpath", [Where to store pid files for the SSSD])
])
AC_DEFUN(WITH_PIPE_PATH,
@@ -50,12 +56,14 @@ AC_DEFUN(WITH_PIPE_PATH,
)
]
)
- pipepath="/var/lib/sss/pipes"
+ config_pipepath="\"VARDIR\"/lib/sss/pipes"
+ pipepath="${localstatedir}/lib/sss/pipes"
if test x"$with_pipe_path" != x; then
+ config_pipepath=$with_pipe_path
pipepath=$with_pipe_path
fi
AC_SUBST(pipepath)
- AC_DEFINE_UNQUOTED(PIPE_PATH, "$pipepath", [Where to store pipe files for the SSSD interconnects])
+ AC_DEFINE_UNQUOTED(PIPE_PATH, "$config_pipepath", [Where to store pipe files for the SSSD interconnects])
])
AC_DEFUN(WITH_POLICYKIT,
@@ -114,12 +122,11 @@ AC_DEFUN(WITH_INIT_DIR,
)
]
)
- initdir="/etc/rc.d/init.d"
+ initdir="${sysconfdir}/rc.d/init.d"
if test x"$with_init_dir" != x; then
initdir=$with_init_dir
fi
AC_SUBST(initdir)
- AC_DEFINE_UNQUOTED(INIT_DIR, "$initdir", [Where to store init script for sssd])
])
diff --git a/server/configure.ac b/server/configure.ac
index 827addbca..a61289c36 100644
--- a/server/configure.ac
+++ b/server/configure.ac
@@ -26,12 +26,6 @@ AC_CONFIG_HEADER(config.h)
TESTS=""
EXTRA_OBJ=""
-SSSD_LIBEXEC_PATH=$libexecdir/$PACKAGE_NAME
-AC_SUBST(SSSD_LIBEXEC_PATH)
-
-SSSD_INTROSPECT_PATH=$datarootdir/$PACKAGE_NAME/introspect
-AC_SUBST(SSSD_INTROSPECT_PATH)
-
m4_include(build_macros.m4)
BUILD_WITH_SHARED_BUILD_DIR
AC_LD_SONAMEFLAG