From: Martin Kraemer Date: Sat, 6 Oct 2001 22:01:10 +0000 (+0000) Subject: Per Ken's veto, the default setting for the manual dir was reverted to the X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f225f0d45c32e12e7ce2c04c7bbee5447adf5ab8;p=thirdparty%2Fapache%2Fhttpd.git Per Ken's veto, the default setting for the manual dir was reverted to the pre-1.3.21 value of @@ServerRoot@@/htdocs/manual. However, using the config.layout mechanism, or using the --manualdir= switch of configure allows you to override this default, and "make install" will not only install into the defined location, but will also fix the config file for you (the Alias and paths are fixed). On non-unix platforms, this may be problematic, as the sed pattern replaces @@ServerRoot@@/htdocs/manual by the setting of $(manualdir). If that does not work for you, then please adapt whatever you used to "make install" (probably not Apache's Makefile.tmpl which contains this sed regex). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@91341 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/Announcement b/Announcement index 9ee30773bdd..957d8ef11dc 100644 --- a/Announcement +++ b/Announcement @@ -92,9 +92,9 @@ Japanese, a guide to using Apache httpd on Cygwin, a lexicon of Apache error messages, updated TPF documentation, and a comprehensive guide to using log files - * The user manual has been moved out of the htdocs DocumentRoot and - is now handled by an Alias directive in a similar way to the icons - directory + * The user manual can now be moved out of the htdocs DocumentRoot + during installation by invoking configure with the --manualdir= + switch, to allow separation of on-line docs from regular contents. * The supplied icons are now also distributed in PNG format * A significant overhaul to the Apache Bench program, ab has taken place, as first reported in April. The new Apache Bench includes diff --git a/Makefile.tmpl b/Makefile.tmpl index 83abbc92697..3027f6bed91 100644 --- a/Makefile.tmpl +++ b/Makefile.tmpl @@ -512,8 +512,8 @@ install-config: echo ""; \ cat $(TOP)/conf/$${conf}-dist ) |\ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ + -e 's;@@ServerRoot@@/htdocs/manual;$(manualdir);' \ -e 's;@@ServerRoot@@/htdocs;$(htdocsdir);' \ - -e 's;@@ServerRoot@@/manual;$(manualdir);' \ -e 's;@@ServerRoot@@/icons;$(iconsdir);' \ -e 's;@@ServerRoot@@/cgi-bin;$(cgidir);' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ diff --git a/STATUS b/STATUS index 8fc352c7e30..e3a3d8a326c 100644 --- a/STATUS +++ b/STATUS @@ -1,5 +1,5 @@ APACHE 1.3 STATUS: -*-text-*- - Last modified at [$Date: 2001/10/06 03:28:39 $] + Last modified at [$Date: 2001/10/06 22:01:09 $] Release: @@ -268,7 +268,7 @@ Win32 specific issues: cause instability - see PR#1729. -Binaries (1.3.21): +Binaries (1.3.22): Platform Avail. Volunteer ------------------------------------------------------------------------------ diff --git a/config.layout b/config.layout index 95906ccfe9d..29e397476b3 100644 --- a/config.layout +++ b/config.layout @@ -21,7 +21,7 @@ datadir: $prefix iconsdir: $datadir/icons htdocsdir: $datadir/htdocs - manualdir: $datadir/manual + manualdir: $htdocsdir/manual cgidir: $datadir/cgi-bin includedir: $prefix/include localstatedir: $prefix @@ -43,7 +43,7 @@ datadir: $prefix/share+ iconsdir: $datadir/icons htdocsdir: $datadir/htdocs - manualdir: $datadir/manual + manualdir: $htdocsdir/manual cgidir: $datadir/cgi-bin includedir: $prefix/include+ localstatedir: $prefix/var+ @@ -64,6 +64,7 @@ datadir: iconsdir: icons htdocsdir: htdocs + manualdir: $htdocsdir/manual cgidir: cgi-bin includedir: include localstatedir: @@ -84,6 +85,7 @@ datadir: $prefix iconsdir: /System/Library/Apache/Icons htdocsdir: $datadir/Documents + manualdir: $htdocsdir/manual cgidir: $datadir/CGI-Executables includedir: /System/Library/Frameworks/Apache.framework/Versions/1.3/Headers localstatedir: /var @@ -104,6 +106,7 @@ sysconfdir: /etc+ iconsdir: $prefix/share/httpd/icons htdocsdir: $datadir/Documents + manualdir: $htdocsdir/manual cgidir: $datadir/CGI-Executables includedir: $prefix/include+ localstatedir: /var @@ -124,6 +127,7 @@ datadir: /home/httpd iconsdir: $datadir/icons htdocsdir: $datadir/html + manualdir: $htdocsdir/manual cgidir: $datadir/cgi-bin includedir: $prefix/include/apache localstatedir: /var @@ -144,7 +148,7 @@ datadir: $prefix/share iconsdir: $datadir/icons htdocsdir: $datadir/htdocs - manualdir: $datadir/manual + manualdir: $htdocsdir/manual cgidir: $datadir/cgi-bin includedir: $prefix/include localstatedir: /var$prefix @@ -165,7 +169,7 @@ datadir: $prefix iconsdir: $datadir/icons htdocsdir: $datadir/htdocs - manualdir: $datadir/manual + manualdir: $htdocsdir/manual cgidir: $datadir/cgi-bin includedir: $prefix/include localstatedir: $prefix @@ -186,7 +190,7 @@ datadir: /usr/local/httpd iconsdir: $datadir/icons htdocsdir: $datadir/htdocs - manualdir: $datadir/manual + manualdir: $htdocsdir/manual cgidir: $datadir/cgi-bin includedir: $prefix/include/apache localstatedir: /var @@ -207,7 +211,7 @@ datadir: $prefix iconsdir: $datadir/icons htdocsdir: $datadir/htdocs - manualdir: $datadir/manual + manualdir: $htdocsdir/manual cgidir: $datadir/cgi-bin includedir: $exec_prefix/include/apache localstatedir: /var @@ -228,7 +232,7 @@ datadir: /var/apache iconsdir: $datadir/icons htdocsdir: $datadir/htdocs - manualdir: $datadir/manual + manualdir: $htdocsdir/manual cgidir: $datadir/cgi-bin includedir: $exec_prefix/include localstatedir: $prefix @@ -249,7 +253,7 @@ datadir: $prefix iconsdir: $prefix/icons htdocsdir: $prefix/htdocs - manualdir: $prefix/manual + manualdir: $htdocsdir/manual cgidir: $prefix/cgi-bin includedir: $exec_prefix/lib/apache/include localstatedir: $prefix diff --git a/src/CHANGES b/src/CHANGES index faba74fa19d..ff9263df931 100644 --- a/src/CHANGES +++ b/src/CHANGES @@ -1,5 +1,11 @@ Changes with Apache 1.3.22 + *) The manual directory is still configurable (as enabled by + the 1.3.21 change), but its default setting was reverted to + the pre-1.3.21 default as a subdirectory of the DocumentRoot. + You can adapt your path in config.layout or with the + "configure --manualdir=" switch. [Martin Kraemer] + *) Additional correction for the mutex changes on the TPF platform. [David McCreedy ]