From b7a4c85eca8befee05122d56d31127ad5eb397f2 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sun, 10 Mar 2013 19:37:06 +0100 Subject: [PATCH] Renamed sysdbd.conf to sysdbd.conf.sample. Also, unconditionally install that file; the user is expected to not change the .sample file but rather use her own custom sysdbd.conf (there is no generic config file anyway that could be shipped and enabled by default). --- src/Makefile.am | 13 +++---------- src/daemon/{sysdbd.conf => sysdbd.conf.sample} | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) rename src/daemon/{sysdbd.conf => sysdbd.conf.sample} (96%) diff --git a/src/Makefile.am b/src/Makefile.am index 787ecda..b75bfff 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,6 +48,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 +88,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 - diff --git a/src/daemon/sysdbd.conf b/src/daemon/sysdbd.conf.sample similarity index 96% rename from src/daemon/sysdbd.conf rename to src/daemon/sysdbd.conf.sample index f6749e1..60a4656 100644 --- a/src/daemon/sysdbd.conf +++ b/src/daemon/sysdbd.conf.sample @@ -1,5 +1,5 @@ # -# Configuration file for the System DataBase daemon (SysDBd). +# Sample configuration file for the System DataBase daemon (SysDBd). # #----------------------------------------------------------------------------# -- 2.30.2