From: robertc <>
Date: Mon, 29 Oct 2001 15:10:21 +0000 (+0000)
Subject: fix race with installing .conf and .conf.default files.
X-Git-Tag: SQUID_3_0_PRE1~1314
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fd8dcbb4910b2202dd6301d676318ec0fd7982e;p=thirdparty%2Fsquid.git

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 5b8d4a694d..6f9957aa08 100644
--- 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 ee6a2845da..12aaee8898 100644
--- 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 \