--------------------- PatchSet 1827 Date: 2001/04/06 22:19:18 Author: rbcollins Branch: squid-amake Tag: (none) Log: mime.conf.default is our souce file now Members: src/Makefile.am:1.1.2.2->1.1.2.3 Index: squid/src/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid/src/Makefile.am,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid/src/Makefile.am 6 Apr 2001 14:12:32 -0000 1.1.2.2 +++ squid/src/Makefile.am 6 Apr 2001 22:19:18 -0000 1.1.2.3 @@ -462,8 +462,8 @@ @if test -f $(sysconfdir)/mime.conf ; then \ echo "$@ will not overwrite existing $(sysconfdir)/mime.conf" ; \ else \ - echo "$(INSTALL_DATA) $(srcdir)/mime.conf $(sysconfdir)/mime.conf.default" ;\ - $(INSTALL_DATA) $(srcdir)/mime.conf $(sysconfdir)/mime.conf.default; \ + echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(sysconfdir)/mime.conf" ;\ + $(INSTALL_DATA) $(srcdir)/mime.conf.default $(sysconfdir)/mime.conf; \ fi @if test -f $(sysconfdir)/squid.conf ; then \ echo "$@ will not overwrite existing $(sysconfdir)/squid.conf" ; \