Don't overwrite an existing config file. Use `collectd.conf.pkg-orig' instead.

diff --git a/Makefile.am b/Makefile.am
index 7dda784e75277ed143a67abb84eda51569c2b6be..dee72e706e030f8cec6274b4120918fe71a96141 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,5 @@ dist-hook:
        find $(distdir) -type d -name '.svn' | xargs rm -rf
 
 install-exec-hook:
-       $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
        $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
        $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME)

diff --git a/src/Makefile.am b/src/Makefile.am
index a93045edd1bc029337fc5a2ac21c88c0e814744c..46d1a69cc38108feb285434d74e3dddf0d1dffa3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -374,8 +374,6 @@ collectd_LDADD += "-dlopen" wireless.la
 collectd_DEPENDENCIES += wireless.la
 endif
 
-sysconf_DATA = collectd.conf
-
 dist_man_MANS = collectd.1 collectd.conf.5
 #collectd_1_SOURCES = collectd.pod
 
@@ -386,3 +384,12 @@ dist_man_MANS = collectd.1 collectd.conf.5
 
 .pod.5:
        pod2man --section=5 --release=$(VERSION) --center=$(PACKAGE) $< >$@
+
+install-exec-hook:
+       $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+       if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \
+       then \
+               $(INSTALL_DATA) collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \
+       else \
+               $(INSTALL_DATA) collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
+       fi