doc: Move doc/tinyproxy.conf to etc/ directory

Makefile.am

@@ -6,32 +6,9 @@ CONFIG_FILES = \
   m4macros/typecheck.m4 m4macros/argenable.m4
 
 EXTRA_DIST = $(CONFIG_FILES) TODO autogen.sh
-SUBDIRS = src data doc packaging
+SUBDIRS = src data etc doc packaging
 
-install-data-local: tinyproxy-configure-file tinyproxy-html-files
-
-# Install the configuration file if it doesn't already exist
-tinyproxy-configure-file:
-	$(mkinstalldirs) $(DESTDIR)@TINYPROXY_CONFIG_DIR@
-	$(INSTALL) -m 600 $(srcdir)/doc/tinyproxy.conf \
-		$(DESTDIR)@TINYPROXY_CONFIG_DIR@/@TINYPROXY_CONFIG_FILE@-dist
-	test -f $(DESTDIR)@TINYPROXY_CONFIG_DIR@/@TINYPROXY_CONFIG_FILE@ \
-		|| $(INSTALL) -m 600 $(srcdir)/doc/tinyproxy.conf \
-			$(DESTDIR)@TINYPROXY_CONFIG_DIR@/@TINYPROXY_CONFIG_FILE@
-	@echo ""
-	@echo "A configuration file has been copied to:"
-	@echo ""
-	@echo "@TINYPROXY_CONFIG_DIR@/@TINYPROXY_CONFIG_FILE@-dist"
-	@echo ""
-	@echo "You will need to rename this file to:"
-	@echo ""
-	@echo "@TINYPROXY_CONFIG_DIR@/@TINYPROXY_CONFIG_FILE@"
-	@echo ""
-	@echo "and modify the values to suit your local system."
-	@echo ""
-	@echo "All the configuration directives are commented in the file, so"
-	@echo "you should not have any problems configuring your system."
-	@echo ""
+install-data-local: tinyproxy-html-files
 
 # Install the HTML files
 tinyproxy-html-files:

configure.ac

@@ -328,6 +328,7 @@ Makefile
 src/Makefile
 data/Makefile
 data/templates/Makefile
+etc/Makefile
 doc/Makefile
 doc/man8/Makefile
 packaging/Makefile

etc/Makefile.am

@@ -0,0 +1,5 @@
+sysconf_DATA = \
+	tinyproxy.conf
+
+EXTRA_DIST = \
+	$(sysconf_DATA)