Author: Henrik Nordstrom <henrik@henriknordstrom.net>

Fixup uninstall squid.conf race by comparing with built files instead of .default

diff --git a/src/Makefile.am b/src/Makefile.am
index 393c334b0c7a1516e2a65662f2d0602e9b1c2bf1..5eac07de84acf107e53dd9cd2e4fc18a9ab34ce2 100644 (file)
--- 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 \