From bd7a9568528cdf146b3fe2e15bbadb7ad5465e62 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Tue, 13 May 2008 08:51:16 -0600 Subject: [PATCH] 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. --- tools/Makefile.am | 2 ++ tools/Makefile.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tools/Makefile.am b/tools/Makefile.am index 819c8bc576..a5b9744f1e 100644 --- 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 6f110dfc1d..2042cf5d8b 100644 --- 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 \ -- 2.47.2