fix race with installing .conf and .conf.default files.

diff --git a/src/Makefile.am b/src/Makefile.am
index 5b8d4a694d2c34815efb54a78271d811bd1a0dd2..6f9957aa086a9734ccec689b5492bec646cf4e7d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.9 2001/10/16 14:25:57 hno Exp $
+#  $Id: Makefile.am,v 1.10 2001/10/29 08:10:21 robertc Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -334,7 +334,7 @@ repl_modules.c: repl_modules.sh Makefile
 auth_modules.c: auth_modules.sh Makefile
        @$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c
 
-install-data-local:
+install-data-local: install-sysconfDATA
        @if test -f $(DESTDIR)$(sysconfdir)/mime.conf ; then \
                echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/mime.conf" ; \
        else \

diff --git a/src/Makefile.in b/src/Makefile.in
index ee6a2845daa3d1ba97c64b6f9ab7e15a308a2005..12aaee889812e3072973a24e0a2aee5d5e306ee3 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.217 2001/10/16 14:25:57 hno Exp $
+#  $Id: Makefile.in,v 1.218 2001/10/29 08:10:21 robertc Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -1074,7 +1074,7 @@ repl_modules.c: repl_modules.sh Makefile
 auth_modules.c: auth_modules.sh Makefile
        @$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c
 
-install-data-local:
+install-data-local: install-sysconfDATA
        @if test -f $(DESTDIR)$(sysconfdir)/mime.conf ; then \
                echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/mime.conf" ; \
        else \