]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Fixup uninstall squid.conf race by comparing with built files instead of .default
authorHenrik Nordstrom <henrik@henriknordstrom.net>
Sat, 19 Sep 2009 01:08:09 +0000 (03:08 +0200)
committerHenrik Nordstrom <henrik@henriknordstrom.net>
Sat, 19 Sep 2009 01:08:09 +0000 (03:08 +0200)
src/Makefile.am

index f4874bfb57b1bf6ae6a53a0db252f2d124bbcd00..5abafe783f78db47820e22d224e79d5e5e463285 100644 (file)
@@ -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 \