From 6aa60e051f66012527332d8f457b2e207eb55e4a Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Thu, 24 Sep 2009 21:37:50 +1200 Subject: [PATCH] Author: Henrik Nordstrom Fixup uninstall squid.conf race by comparing with built files instead of .default --- src/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 393c334b0c..5eac07de84 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -804,9 +804,9 @@ install-data-local: install-sysconfDATA install-dataDATA $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \ $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX) -uninstall-local: - @$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh "$(RM)" $(DESTDIR)$(DEFAULT_MIME_TABLE) - @$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh "$(RM)" $(DESTDIR)$(DEFAULT_CONFIG_FILE) +uninstall-local: squid.conf.default + @$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh "$(RM)" $(DESTDIR)$(DEFAULT_MIME_TABLE) $(srcdir)/mime.conf.default + @$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh "$(RM)" $(DESTDIR)$(DEFAULT_CONFIG_FILE) squid.conf.default CLEANFILES += cf_gen_defines.h cf.data cf_parser.h squid.conf.default squid.conf.documented \ globals.cc string_arrays.c repl_modules.cc DiskIO/DiskIOModules_gen.cc \ -- 2.47.3