From: Amos Jeffries Date: Fri, 10 Jul 2009 07:06:53 +0000 (+1200) Subject: Shuffle cachemgr.cgi.8 into tools/ with cachemgr.cgi code X-Git-Tag: SQUID_3_2_0_1~900 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=473d1237253acc361906df35d3af2ad10cb13ad3;p=thirdparty%2Fsquid.git Shuffle cachemgr.cgi.8 into tools/ with cachemgr.cgi code To perform this shuffle the SUBSTITUTE make code pushed into a sub-include at doc/manuals/Substitute.am for shared use. Also clean up the manual titles to reflect the binary they apply to rather than the generic Squid project release name. The use of generic @SYSCONFDIR@ and specific filenames allows the translation strings to be more specific, readable for translators and reduces Makefile complexity at once. squid.conf etc are widely mentioned and used enough that allowing for alternative names at this point seems meaningless. --- diff --git a/doc/Makefile.am b/doc/Makefile.am index d3649a400f..5bce2a4640 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,41 +1,19 @@ -# -# Makefile for the Squid Object Cache server -# -# $Id$ -# -# Uncomment and customize the following to suit your needs: -# SUBDIRS = manuals DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf -DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf DEFAULT_ERROR_DIR = $(datadir)/errors -SUBSTITUTE=sed "\ - s%@DEFAULT_CONFIG_FILE@%$(DEFAULT_CONFIG_FILE)%g;\ - s%@DEFAULT_CACHEMGR_CONFIG@%$(DEFAULT_CACHEMGR_CONFIG)%g;\ - s%@DEFAULT_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g;\ - s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\ - s%@""PACKAGE_STRING""@%$(PACKAGE_STRING)%g;\ - " +include $(top_srcdir)/doc/manuals/Substitute.am squid.8: $(srcdir)/squid.8.in Makefile $(SUBSTITUTE) < $(srcdir)/squid.8.in > $@ -cachemgr.cgi.8: $(srcdir)/cachemgr.cgi.8.in Makefile - $(SUBSTITUTE) < $(srcdir)/cachemgr.cgi.8.in > $@ - -man_MANS = \ - squid.8 \ - cachemgr.cgi.8 +man_MANS = squid.8 EXTRA_DIST = \ squid.8.in \ - cachemgr.cgi.8.in \ debug-sections.txt -CLEANFILES = \ - squid.8 \ - cachemgr.cgi.8 +CLEANFILES = squid.8 diff --git a/doc/squid.8.in b/doc/squid.8.in index b4c04445d3..60ec99226d 100644 --- a/doc/squid.8.in +++ b/doc/squid.8.in @@ -1,4 +1,4 @@ -.TH squid 8 "@PACKAGE_STRING@" +.TH squid 8 "Squid Web Proxy" .\" Copyright and licensing information .\" goes here. .SH NAME @@ -58,7 +58,7 @@ This manual page only lists the command line arguments. For details on how to configure .B squid see the file -.BI @DEFAULT_CONFIG_FILE@.documented, +.BI @SYSCONFDIR@/squid.conf.documented, the Squid wiki FAQ and examples at http://wiki.squid-cache.org/ , or the configuration manual on the @@ -74,7 +74,7 @@ to any http_port specifications in squid.conf. Write debugging to stderr also. .IP "-f file" Use the given config-file instead of -.IR @DEFAULT_CONFIG_FILE@ . +.IR @SYSCONFDIR@/squid.conf . If the file name starts with a ! or | then it is assumed to be an external command or command line. Can for example be used to pre-process the configuration before it is being read by Squid. To facilitate this Squid @@ -94,7 +94,7 @@ Specify Windows Service name to use for service operations, default is: Remove a Windows Service (see -n option). .IP -s Enable logging to syslog. Also configurable in -.BI @DEFAULT_CONFIG_FILE@ +.BI @SYSCONFDIR@/squid.conf .IP "-l facility" Use specified syslog facility. implies -s .IP "-u port" @@ -121,7 +121,7 @@ Force full debugging. Only return UDP_HIT or UDP_MISS_NOFETCH during fast reload. .SH FILES -.I @DEFAULT_CONFIG_FILE@ +.I @SYSCONFDIR@/squid.conf .RS The main configuration file. You must initially make changes to this file for @@ -137,7 +137,7 @@ the version of Squid you are using. Use this to look up the default configuration settings and syntax after upgrading. .RE -.I @DEFAULT_CONFIG_FILE@.documented +.I @SYSCONFDIR@/squid.conf.documented .RS Reference copy of the configuration file. Always kept up to date with the version of Squid you are using. Use this to read the documentation diff --git a/test-suite/buildtests/layer-00-default.opts b/test-suite/buildtests/layer-00-default.opts index 74779fcfc7..cd81c46d2f 100644 --- a/test-suite/buildtests/layer-00-default.opts +++ b/test-suite/buildtests/layer-00-default.opts @@ -1,9 +1,9 @@ # # # Complete Check - everything MUST work at this level -MAKETEST="distcheck" +MAKETEST="check" # # Default configuration options. # - Nothing special configured. Just whatever is found by "./configure" # -OPTS="" +OPTS=" --disable-loadable-modules " diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts index ba8a9b580f..2d16b17e14 100644 --- a/test-suite/buildtests/layer-02-maximus.opts +++ b/test-suite/buildtests/layer-02-maximus.opts @@ -41,7 +41,7 @@ MAKETEST="check" # # OPTS=" \ - --enable-loadable-modules \ + --disable-loadable-modules \ --enable-gnuregex \ --enable-optimizations \ --enable-inline \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 550183280e..d5366517e0 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -11,35 +11,50 @@ AUTOMAKE_OPTIONS = subdir-objects ## we need our local files too (but avoid -I. at all costs) INCLUDES += -I$(srcdir) +SUBDIRS = +EXTRA_DIST = +man_MANS = +DISTCLEANFILES = -SUBDIRS = +LDADD = \ + ../compat/libcompat.la \ + ../src/ip/libip.la \ + -L../lib -lmiscutil \ + $(XTRA_LIBS) -bin_PROGRAMS = \ - squidclient +include $(top_srcdir)/doc/manuals/Substitute.am -libexec_PROGRAMS = \ - cachemgr$(CGIEXT) -man_MANS = \ - squidclient.1 +## ##### squidclient ##### -DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf +bin_PROGRAMS = squidclient squidclient_SOURCES = squidclient.cc + +EXTRA_DIST += squidclient.1 +man_MANS += squidclient.1 + + + +## ##### cachemgr.cgi ##### + +DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf + +libexec_PROGRAMS = cachemgr$(CGIEXT) + cachemgr__CGIEXT__SOURCES = cachemgr.cc cachemgr__CGIEXT__CXXFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CXXFLAGS) -LDADD = \ - ../compat/libcompat.la \ - ../src/ip/libip.la \ - -L../lib -lmiscutil \ - $(XTRA_LIBS) +EXTRA_DIST += cachemgr.conf cachemgr.cgi.8 +CLEANFILES += cachemgr.cgi.8 +man_MANS += cachemgr.cgi.8 + +cachemgr.cgi.8: $(srcdir)/cachemgr.cgi.8.in Makefile + $(SUBSTITUTE) < $(srcdir)/cachemgr.cgi.8.in > $@ + -EXTRA_DIST = \ - cachemgr.conf \ - squidclient.1 -$(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h +## Shared install-data-local: $(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default @@ -53,6 +68,3 @@ install-data-local: uninstall-local: @$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh "$(RM)" $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) $(RM) -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default - -DISTCLEANFILES = - diff --git a/doc/cachemgr.cgi.8.in b/tools/cachemgr.cgi.8.in similarity index 93% rename from doc/cachemgr.cgi.8.in rename to tools/cachemgr.cgi.8.in index 117f3eb803..9df70620e7 100644 --- a/doc/cachemgr.cgi.8.in +++ b/tools/cachemgr.cgi.8.in @@ -1,4 +1,4 @@ -.TH cachemgr.cgi 8 "@PACKAGE_STRING@" +.TH cachemgr.cgi 8 "Squid Cache Manager CGI Web Interface" .\" Copyright and licensing information .\" goes here. .SH NAME @@ -13,7 +13,7 @@ into the server. .SH FILES .I ./cachemgr.conf .br -.I @DEFAULT_CACHEMGR_CONFIG@ +.I @SYSCONFDIR@/cachemgr.conf .RS The access configuration file defining which Squid servers may be managed via this cachemgr.cgi program. Each line specifies a @@ -38,6 +38,7 @@ Configuration examples for many common web servers can be found in the Squid FAQ. .SH SEE ALSO .BR squid "(8)" +.BR squidclient "(1)" .br .BR "The Squid FAQ" ", Chapter 9 The Cache Manager" .\" Could add the following sections: diff --git a/tools/squidclient.1 b/tools/squidclient.1 index 391bfc3d0b..d8810fad8c 100644 --- a/tools/squidclient.1 +++ b/tools/squidclient.1 @@ -1,4 +1,4 @@ -.TH SQUIDCLIENT 1 "Mar 1998" "Squid Cache" "Debian Linux" +.TH SQUIDCLIENT 1 "Mar 1998" "Squid Web Client Tool" .SH NAME squidclient -- client interface to the squid cache .SH SYNOPSIS