diff options
| author | Simo Sorce <ssorce@redhat.com> | 2009-03-12 22:19:10 -0400 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2009-03-13 13:47:33 -0400 |
| commit | 063ef0f15dfc32d15d2e9bdcba819906aa99b948 (patch) | |
| tree | ce846ec9fb4124954f76f8cb277d703037cffa7f /server/Makefile.in | |
| parent | 97bc7d0cb0c5fa245b2736d51295d1da0d8311e0 (diff) | |
| download | sssd-063ef0f15dfc32d15d2e9bdcba819906aa99b948.tar.gz sssd-063ef0f15dfc32d15d2e9bdcba819906aa99b948.tar.xz sssd-063ef0f15dfc32d15d2e9bdcba819906aa99b948.zip | |
Fix makefiles
Make so that definitions in the code and install paths actually match
Diffstat (limited to 'server/Makefile.in')
| -rw-r--r-- | server/Makefile.in | 24 |
1 files changed, 13 insertions, 11 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) |