Commit 1192dd4f authored by Martin Kraemer's avatar Martin Kraemer
Browse files

My first try at relocating the manual tree outside of the htdocs/ directory. 

It will now reside in the ServerRoot, alongside with .../man/ and .../icons/
and .../htdocs/
-
Please review the config.layout entries for the vendor specific entries,
I supplied sensible defaults but you may disagree.

Reviewed by:	William A. Rowe, Jr., Joshua Slive, Rich Bowen


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90551 13f79535-47bb-0310-9956-ffa450edef68
parent e947005b

Makefile.in

+2 −2
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ install-htdocs: 
	@echo Installing HTML documents

	@test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)

	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))

	@test -d $(htdocsdir)/manual || $(MKINSTALLDIRS) $(htdocsdir)/manual

	@test -d docs/manual && (cd docs/manual && cp -rp * $(htdocsdir)/manual)

	@test -d $(prefix)/manual || $(MKINSTALLDIRS) $(prefix)/manual

	@test -d docs/manual && (cd docs/manual && cp -rp * $(prefix)/manual)

	@(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)



install-error:

acinclude.m4

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ 
  APACHE_SUBST(mandir)

  APACHE_SUBST(libexecdir)

  APACHE_SUBST(htdocsdir)

  APACHE_SUBST(manualdir)

  APACHE_SUBST(includedir)

  APACHE_SUBST(errordir)

  APACHE_SUBST(iconsdir)
@@ -320,6 +321,7 @@ if test -z "$LAYOUT"; then 
  # create the Apache layout in config.layout, and it really should just

  # use what is specified in config.layout instead of duping it.

  htdocsdir='$(prefix)/htdocs'

  manualdir='$(prefix)/manual'

  errordir='$(prefix)/error'

  iconsdir='$(prefix)/icons'

  cgidir='$(prefix)/cgi-bin'

config.layout

+12 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    errordir:      $datadir/error

    iconsdir:      $datadir/icons

    htdocsdir:     $datadir/htdocs

    manualdir:     $datadir/manual

    cgidir:        $datadir/cgi-bin

    includedir:    $prefix/include

    localstatedir: $prefix
@@ -44,6 +45,7 @@ 
    errordir:      $datadir/error

    iconsdir:      $datadir/icons

    htdocsdir:     $datadir/htdocs

    manualdir:     $datadir/manual

    cgidir:        $datadir/cgi-bin

    includedir:    $prefix/include+

    localstatedir: $prefix/var+
@@ -65,6 +67,7 @@ 
    errordir:      error

    iconsdir:      icons

    htdocsdir:     htdocs

    manualdir:     manual

    cgidir:        cgi-bin

    includedir:    include

    localstatedir:
@@ -85,6 +88,7 @@ 
    datadir:       $prefix

    errordir:      /System/Library/Apache/Error

    iconsdir:      /System/Library/Apache/Icons

    manualdir:     /System/Library/Apache/Manual

    htdocsdir:     $datadir/Documents

    cgidir:        $datadir/CGI-Executables

    includedir:    /System/Library/Frameworks/Apache.framework/Versions/1.3/Headers
@@ -107,6 +111,7 @@ 
    errordir:      $prefix/share/httpd/error

    iconsdir:      $prefix/share/httpd/icons

    htdocsdir:     $datadir/Documents

    manualdir:     $datadir/share/httpd/manual

    cgidir:        $datadir/CGI-Executables

    includedir:    $prefix/include+

    localstatedir: /var
@@ -128,6 +133,7 @@ 
    errordir:      $datadir/error

    iconsdir:      $datadir/icons

    htdocsdir:     $datadir/html

    manualdir:     $datadir/manual

    cgidir:        $datadir/cgi-bin

    includedir:    $prefix/include/apache

    localstatedir: /var
@@ -149,6 +155,7 @@ 
    errordir:      $datadir/error

    iconsdir:      $datadir/icons

    htdocsdir:     $datadir/htdocs

    manualdir:     $datadir/manual

    cgidir:        $datadir/cgi-bin

    includedir:    $prefix/include

    localstatedir: /var$prefix
@@ -170,6 +177,7 @@ 
    errordir:      $datadir/error

    iconsdir:      $datadir/icons

    htdocsdir:     $datadir/htdocs

    manualdir:     $datadir/manual

    cgidir:        $datadir/cgi-bin

    includedir:    $prefix/include

    localstatedir: $prefix
@@ -191,6 +199,7 @@ 
    errordir:      $datadir/error

    iconsdir:      $datadir/icons

    htdocsdir:     $datadir/htdocs

    manualdir:     $datadir/manual

    cgidir:        $datadir/cgi-bin

    includedir:    $prefix/include/apache

    localstatedir: /var
@@ -212,6 +221,7 @@ 
    errordir:      $datadir/error

    iconsdir:      $datadir/icons

    htdocsdir:     $datadir/htdocs

    manualdir:     $datadir/manual

    cgidir:        $datadir/cgi-bin

    includedir:    $exec_prefix/include/apache

    localstatedir: /var
@@ -233,6 +243,7 @@ 
    errordir:      $datadir/error

    iconsdir:      $datadir/icons

    htdocsdir:     $datadir/htdocs

    manualdir:     $datadir/manual

    cgidir:        $datadir/cgi-bin

    includedir:    $exec_prefix/include

    localstatedir: $prefix
@@ -254,6 +265,7 @@ 
    errordir:      $prefix/error

    iconsdir:      $prefix/icons

    htdocsdir:     $prefix/htdocs

    manualdir:     $datadir/manual

    cgidir:        $prefix/cgi-bin

    includedir:    $exec_prefix/lib/apache/include

    localstatedir: $prefix

docs/conf/httpd-std.conf

+3 −3
Original line number Diff line number Diff line
@@ -489,13 +489,13 @@ Alias /icons/ "@@ServerRoot@@/icons/" 
</Directory>



#

# This should be changed to the ServerRoot/htdocs/manual/.  The alias provides

# This should be changed to the ServerRoot/manual/.  The alias provides

# the manual, even if you choose to move your DocumentRoot.  You may comment

# this out if you do not care for the documentation.

#

Alias /manual "@@ServerRoot@@/htdocs/manual"

Alias /manual "@@ServerRoot@@/manual"



<Directory "@@ServerRoot@@/htdocs/manual/">

<Directory "@@ServerRoot@@/manual/">

    Options Indexes FollowSymLinks MultiViews

    AllowOverride None

    Order allow,deny