Add cachemgr.conf.default for easier maintenance

cachemgr.conf has for a long while been created conditionally if none
already existed, but no current new default file was added to compare
for new configuration options.

This patch adds a file named cachemgr.conf.default next to the cachemgr.conf

cachemgr.conf.default file is replaces unconditionally so that it remains
current with the most recently installed build.
cachemgr.conf itself is only created if not already present so as not to
loose local configuration changes.

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 819c8bc5765efd53c24f357bb337b6df29cd6e20..a5b9744f1e6da07e00debc9d4b928ff5e2d0c36a 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -37,6 +37,8 @@ DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
 $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h
 
 install-data-local:
+       @echo "$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default"; \
+       $(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default; \
        @if test -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) ; then \
                echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)" ; \
        else \

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 6f110dfc1d8c950a3b8c345f65eeff7abd618c29..2042cf5d8b68e2ee9bd6044e00a191847ffc02fa 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -849,6 +849,8 @@ uninstall-info: uninstall-info-recursive
 $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h
 
 install-data-local:
+       @echo "$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default"; \
+       $(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default; \
        @if test -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) ; then \
                echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)" ; \
        else \