Renamed error recording / logging functions.

[sysdb.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 787ecdaa2c63cc3b4efccc31350348767abf0046..9de8dd02b966108990b20f76f25785039870236c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,7 @@ libsysdb_la_SOURCES = \
                core/plugin.c include/core/plugin.h \
                core/store.c include/core/store.h \
                include/utils/data.h \
+               utils/error.c include/utils/error.h \
                utils/llist.c include/utils/llist.h \
                utils/string.c include/utils/string.h \
                utils/time.c include/utils/time.h \
@@ -48,6 +49,9 @@ sysdbd_CFLAGS = $(AM_CFLAGS) -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\""
 sysdbd_LDADD = libsysdb.la liboconfig/liboconfig.la
 sysdbd_DEPENDENCIES = liboconfig/liboconfig.la
 
+sdbconfdir = $(sysconfdir)/sysdb
+dist_sdbconf_DATA = daemon/sysdbd.conf.sample
+
 pkgbackendlibdir = $(pkglibdir)/backend
 
 pkgbackendlib_LTLIBRARIES =
@@ -85,13 +89,3 @@ include/sysdb.h: include/sysdb.h.in ../version
            -e "s/@SDB_VERSION_STRING@/$$VERSION_STRING/g" \
            include/sysdb.h.in > include/sysdb.h
 
-install-exec-hook:
-       $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/sysdb
-       if test -e $(DESTDIR)$(sysconfdir)/sysdb/sysdbd.conf; then \
-               $(INSTALL) -m 0640 daemon/sysdbd.conf \
-                       $(DESTDIR)$(sysconfdir)/sysdb/sysdbd.conf.pkg-orig; \
-       else \
-               $(INSTALL) -m 0640 daemon/sysdbd.conf \
-                       $(DESTDIR)$(sysconfdir)/sysdb/sysdbd.conf; \
-       fi
-