Re: mime.conf->mime.conf.default

On Mon, Aug 20, 2001, Robert Collins wrote:
> Identical change as for squid.conf - without the mistake :}. The
> reasoning is the same - mime.conf.default is always installed, mime.conf
> should therefore be the exception, not the rule.
>
> This also needs a rename of mime.conf to mime.conf.default in cvs.
>
> Any objections?

None from me.
What I'll do is copy the ,v file to mime.conf.default to keep the
CVS history, and then we can cvs rm the file in the relevant
branches.

Just say when.

Adrian

>
> Index: src/Makefile.in
> ===================================================================
> RCS file: /cvsroot/squid/squid/src/Makefile.in,v
> retrieving revision 1.11
> diff -u -p -r1.11 Makefile.in
> --- src/Makefile.in 2001/08/19 10:13:18 1.11
> +++ src/Makefile.in 2001/08/20 02:41:26
> @@ -401,12 +401,12 @@ install: all install-mkdirs
> $(INSTALL_FILE) squid.conf.default $(sysconfdir)/squid.conf; \
> fi
>
> - $(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir)/mime.conf.default
> + $(INSTALL_FILE) $(srcdir)/mime.conf.default $(sysconfdir)
> @if test -f $(sysconfdir)/mime.conf ; then \
> echo "$@ will not overwrite existing $(sysconfdir)/mime.conf" ; \
> else \
> - echo "$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir)"; \
> - $(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir); \
> + echo "$(INSTALL_FILE) $(srcdir)/mime.conf.default
> $(sysconfdir)/mime.conf"; \
> + $(INSTALL_FILE) $(srcdir)/mime.conf.default $(sysconfdir)/mime.conf;
> \
> fi
>
> install-pinger:
>
>
Received on Sun Aug 19 2001 - 21:41:29 MDT