From 5b218ff4e9b8b89668f0b1d7b8f2e74f4551249f Mon Sep 17 00:00:00 2001 From: Henrik Nordstrom Date: Sat, 19 Sep 2009 03:08:09 +0200 Subject: [PATCH] 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 f4874bfb57..5abafe783f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -830,9 +830,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.data squid.conf.default squid.conf.documented \ DiskIO/DiskIOModules_gen.cc \ -- 2.47.3