diff options
| -rw-r--r-- | Makefile.am | 27 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | etc/Makefile.am | 5 | ||||
| -rw-r--r-- | etc/tinyproxy.conf (renamed from doc/tinyproxy.conf) | 0 |
4 files changed, 8 insertions, 25 deletions
diff --git a/Makefile.am b/Makefile.am index db684cf..f76c9f0 100644 --- a/Makefile.am +++ b/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: diff --git a/configure.ac b/configure.ac index fa969ef..0cb4d24 100644 --- a/configure.ac +++ b/configure.ac @@ -328,6 +328,7 @@ Makefile src/Makefile data/Makefile data/templates/Makefile +etc/Makefile doc/Makefile doc/man8/Makefile packaging/Makefile diff --git a/etc/Makefile.am b/etc/Makefile.am new file mode 100644 index 0000000..5e8b370 --- /dev/null +++ b/etc/Makefile.am @@ -0,0 +1,5 @@ +sysconf_DATA = \ + tinyproxy.conf + +EXTRA_DIST = \ + $(sysconf_DATA) diff --git a/doc/tinyproxy.conf b/etc/tinyproxy.conf index 1711ebd..1711ebd 100644 --- a/doc/tinyproxy.conf +++ b/etc/tinyproxy.conf |